From 6a7748e79cb7118089d5857291cb76d57c5c8162 Mon Sep 17 00:00:00 2001 From: "robertshield@chromium.org" Date: Fri, 27 May 2011 16:44:31 +0000 Subject: Add a self-destruct mechanism to user-level Chrome Frame when it detects that system-level Chrome Frame is present. This is a first step to handling user-to-system-level handoff. It will cause a user-level install to be correctly replaced with a system-level one once the user logs out and back in again. Additional changelists will follow that: 1) Ensure full clean-up of the user-level installation. 2) Handle notifications such that logging out and in again isn't required. BUG=82816 TEST=Install user-level Chrome Frame. Review URL: http://codereview.chromium.org/7065024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87033 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/util/browser_distribution.cc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'chrome/installer/util/browser_distribution.cc') diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index 8a1ed71..18dba7e 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -43,14 +43,6 @@ bool IsChromeFrameModule() { installer::kChromeFrameDll); } -// Returns true if currently running in ceee_broker.exe -bool IsCeeeBrokerProcess() { - FilePath exe_path; - PathService::Get(base::FILE_EXE, &exe_path); - return FilePath::CompareEqualIgnoreCase(exe_path.BaseName().value(), - installer::kCeeeBrokerExe); -} - BrowserDistribution::Type GetCurrentDistributionType() { static BrowserDistribution::Type type = (MasterPreferences::ForCurrentProcess().install_chrome_frame() || -- cgit v1.1