Add a self-destruct mechanism to user-level Chrome Frame when it detects that system-level Chrome...

chrome_frame/bho_loader.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

[grt (UTC plus 2), 2011/05/25 16:10:07]

2011

[robertshield, 2011/05/26 15:14:28]

Copyright year nits.. grumble.. :)

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/bho_loader.h"
 
 #include <atlbase.h>
 #include <atlcomcli.h>
 #include <exdisp.h>
 
 #include "chrome_frame/chrome_frame_helper_util.h"
@@ skipping 52 matching lines @@
     }
 
     if (browser_hwnd != NULL) {
       // Step 3:
       // Parent window of status bar window is the web browser window. Try to
       // get its IWebBrowser2 interface
       CComPtr<IWebBrowser2> browser;
       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,
                         ARRAYSIZE(bho_clsid_as_string));
         CComBSTR bho_clsid_as_string_bstr(bho_clsid_as_string);
 
         CComVariant existing_bho;
         HRESULT hr = browser->GetProperty(bho_clsid_as_string_bstr,
                                           &existing_bho);
 
@@ skipping 33 matching lines @@
 }
 
 void BHOLoader::StopHook() {
   hooker_->StopHook();
 }
 
 BHOLoader* BHOLoader::GetInstance() {
   static BHOLoader loader;
   return &loader;
 }