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

chrome_frame/chrome_tab.cc

Index: chrome_frame/chrome_tab.cc
===================================================================
--- chrome_frame/chrome_tab.cc	(revision 85906)
+++ chrome_frame/chrome_tab.cc	(working copy)
@@ -70,6 +70,7 @@
 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
@@ -375,9 +376,13 @@
                                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);