Register Application Restart with Windows Restart Manager

chrome/browser/browser_main_win.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.
 
 #include "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
@@ skipping 127 matching lines @@
   string16 adjusted_string(
       l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_CONTENT));
   base::i18n::AdjustStringForLocaleDirection(&adjusted_string);
   dlg_strings.append(adjusted_string);
   dlg_strings.push_back('|');
   dlg_strings.append(ASCIIToUTF16(
       base::i18n::IsRTL() ? env_vars::kRtlLocale : env_vars::kLtrLocale));
 
   env->SetVar(env_vars::kRestartInfo, UTF16ToUTF8(dlg_strings));
 }
 

[cpu_(ooo_6.6-7.5), 2011/02/10 18:59:24]

why not return bool ?

[msw, 2011/02/10 19:54:54]

Done.

+void RegisterApplicationRestart(const CommandLine &parsed_command_line) {

[Evan Martin, 2011/02/10 19:38:31]

& on the left of the space

[msw, 2011/02/10 19:54:54]

Done. Also fixed other instances in this file.

+  // The Windows Restart Manager expects a string of command line flags only,
+  // without the program.
+  CommandLine command_line(CommandLine::NO_PROGRAM);
+  command_line.AppendSwitches(parsed_command_line);
+  command_line.AppendArgs(parsed_command_line);

[Evan Martin, 2011/02/10 19:38:31]

I wonder if, rather than adding these extra APIs, it would be sufficient to
create a CommandLine where the "program" was the empty string?

[msw, 2011/02/10 19:54:54]

Yes, I propose to fix and cleanup CommandLine code in a new prerequisite
blocking Issue.

[msw, 2011/02/16 23:15:53]

I'll follow up on the extensive amount of needed CommandLine cleanup work with
Issue 73195; this should suffice in the mean time. Please let me know if you
disagree.

+  // Ensure restore last session is set.
+  if (!command_line.HasSwitch(switches::kRestoreLastSession))
+    command_line.AppendSwitch(switches::kRestoreLastSession);
+  PCWSTR command_line_string = command_line.command_line_string().c_str();

[cpu_(ooo_6.6-7.5), 2011/02/10 18:59:24]

we don't use PCWSTR replace with const wchar_t*

[msw, 2011/02/10 19:54:54]

Done.

+  // Restart Chrome if the computer is restarted as the result of an update.
+  // This could be extended to handle crashes, hangs, and patches.
+  HRESULT hr = ::RegisterApplicationRestart(command_line_string,
+      RESTART_NO_CRASH | RESTART_NO_HANG | RESTART_NO_PATCH);
+  DCHECK(SUCCEEDED(hr)) << "RegisterApplicationRestart failed.";
+}
+
 // This method handles the --hide-icons and --show-icons command line options
 // for chrome that get triggered by Windows from registry entries
 // HideIconsCommand & ShowIconsCommand. Chrome doesn't support hide icons
 // functionality so we just ask the users if they want to uninstall Chrome.
 int HandleIconsCommands(const CommandLine &parsed_command_line) {
   if (parsed_command_line.HasSwitch(switches::kHideIcons)) {
     string16 cp_applet;
     base::win::Version version = base::win::GetVersion();
     if (version >= base::win::VERSION_VISTA) {
       cp_applet.assign(L"Programs and Features");  // Windows Vista and later.
@@ skipping 86 matching lines @@
       base::EnsureNSPRInit();
     }
   }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsWin(parameters);
 }