diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 16:44:31 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 16:44:31 +0000 |
| commit | 6a7748e79cb7118089d5857291cb76d57c5c8162 (patch) | |
| tree | bdfe13aba5f79d4c090bd27fdf75173ff751bb3c /chrome_frame/bho_loader.cc | |
| parent | 13ffa32ea65d5fda56bcb030643b989d5564c586 (diff) | |
| download | chromium_src-6a7748e79cb7118089d5857291cb76d57c5c8162.zip chromium_src-6a7748e79cb7118089d5857291cb76d57c5c8162.tar.gz chromium_src-6a7748e79cb7118089d5857291cb76d57c5c8162.tar.bz2 | |
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
Diffstat (limited to 'chrome_frame/bho_loader.cc')
| -rw-r--r-- | chrome_frame/bho_loader.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome_frame/bho_loader.cc b/chrome_frame/bho_loader.cc index 2cf547d..255bb6c 100644 --- a/chrome_frame/bho_loader.cc +++ b/chrome_frame/bho_loader.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -71,6 +71,12 @@ void BHOLoader::OnHookEvent(DWORD event, HWND window) { UtilGetWebBrowserObjectFromWindow(browser_hwnd, __uuidof(browser), reinterpret_cast<void**>(&browser)); if (browser) { + if (IsSystemLevelChromeFrameInstalled()) { + // We're in the right place, but a system-level installation has + // appeared. We should leave now. + return; + } + // Figure out if we're already in the property map. wchar_t bho_clsid_as_string[MAX_PATH] = {0}; StringFromGUID2(CLSID_ChromeFrameBHO, bho_clsid_as_string, |