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

chrome_frame/chrome_tab.cc

 // 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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Include without path to make GYP build see it.
 #include "chrome_tab.h"  // NOLINT
 
 #include <atlsecurity.h>
@@ skipping 52 matching lines @@
 
 const wchar_t kProtocolHandlers[] =
     L"Software\\Classes\\Protocols\\Handler";
 
 const wchar_t kRunOnce[] =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce";
 
 const wchar_t kRunKeyName[] = L"ChromeFrameHelper";
 
 const wchar_t kChromeFrameHelperExe[] = L"chrome_frame_helper.exe";
+const wchar_t kChromeFrameHelperFirstRunArg[] = L"--first-run";
 
 // Window class and window names.
 // TODO(robertshield): These and other constants need to be refactored into
 // a common chrome_frame_constants.h|cc and built into a separate lib
 // (either chrome_frame_utils or make another one).
 const wchar_t kChromeFrameHelperWindowClassName[] =
     L"ChromeFrameHelperWindowClass";
 const wchar_t kChromeFrameHelperWindowName[] =
     L"ChromeFrameHelperWindowName";
 
@@ skipping 285 matching lines @@
     }
   } else {
     NOTREACHED();
   }
 
   // Find window handle of existing instance.
   HWND old_window = FindWindow(kChromeFrameHelperWindowClassName,
                                kChromeFrameHelperWindowName);
 
   if (file_util::PathExists(helper_path)) {
+    std::wstring helper_path_cmd(helper_path.value());

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

I think it's best to quote the path.  Unless, of course, there's some gnarly
reason why Windows will barf on a quoted exe path in this one context.

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

Done.

+    helper_path_cmd += L" ";
+    helper_path_cmd += kChromeFrameHelperFirstRunArg;

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

Why not chrome::switches::kFirstRun?

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

they do different things, sorry I hadn't uploaded the last edit that included
the string change.

+
     // Add new run-at-startup entry.
     base::win::AddCommandToAutoRun(HKEY_CURRENT_USER, kRunKeyName,
-                                  helper_path.value());
+                                   helper_path_cmd);
 
     // Start new instance.
     bool launched = base::LaunchApp(helper_path.value(), false, true, NULL);
     if (!launched) {
       NOTREACHED();
       LOG(ERROR) << "Could not launch helper process.";
     }
 
     // Kill old instance using window handle.
     if (IsWindow(old_window)) {
@@ skipping 449 matching lines @@
     sd.GetDacl(&new_dacl);
     new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ);
     if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) {
       result = SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE);
     }
   }
 
   backup.RestoreSecurity(object_name.c_str());
   return result;
 }