| Index: chrome/browser/first_run_win.cc
|
| diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc
|
| index 86a79e55ed3911f33e7a30c1cf93d984092d9d0a..cc34dc1814b8edab3a9a4c08de98ae3629862abb 100644
|
| --- a/chrome/browser/first_run_win.cc
|
| +++ b/chrome/browser/first_run_win.cc
|
| @@ -205,8 +205,6 @@ class FirsRunDelayedTasks : public NotificationObserver {
|
|
|
| } // namespace
|
|
|
| -CommandLine* Upgrade::new_command_line_ = NULL;
|
| -
|
| bool FirstRun::CreateChromeDesktopShortcut() {
|
| std::wstring chrome_exe;
|
| if (!PathService::Get(base::FILE_EXE, &chrome_exe))
|
| @@ -412,18 +410,6 @@ bool Upgrade::RelaunchChromeBrowser(const CommandLine& command_line) {
|
| 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))
|
| @@ -1034,3 +1020,4 @@ Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
|
| TryChromeDialog td;
|
| return td.ShowModal();
|
| }
|
| +
|
|
|