| Index: chrome/browser/first_run_win.cc
|
| ===================================================================
|
| --- chrome/browser/first_run_win.cc (revision 45984)
|
| +++ chrome/browser/first_run_win.cc (working copy)
|
| @@ -205,6 +205,8 @@
|
|
|
| } // namespace
|
|
|
| +CommandLine* Upgrade::new_command_line_ = NULL;
|
| +
|
| bool FirstRun::CreateChromeDesktopShortcut() {
|
| std::wstring chrome_exe;
|
| if (!PathService::Get(base::FILE_EXE, &chrome_exe))
|
| @@ -410,6 +412,18 @@
|
| false, false, NULL);
|
| }
|
|
|
| +void Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded() {
|
| + if (new_command_line_) {
|
| + if (RelaunchChromeBrowser(*new_command_line_)) {
|
| + DLOG(ERROR) << "Launching a new instance of the browser failed.";
|
| + } else {
|
| + DLOG(WARNING) << "Launched a new instance of the browser.";
|
| + }
|
| + delete new_command_line_;
|
| + new_command_line_ = NULL;
|
| + }
|
| +}
|
| +
|
| bool Upgrade::SwapNewChromeExeIfPresent() {
|
| std::wstring new_chrome_exe;
|
| if (!GetNewerChromeFile(&new_chrome_exe))
|
| @@ -1020,4 +1034,3 @@
|
| TryChromeDialog td;
|
| return td.ShowModal();
|
| }
|
| -
|
|
|