diff options
| author | prasadt@chromium.org <prasadt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 18:55:53 +0000 |
|---|---|---|
| committer | prasadt@chromium.org <prasadt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 18:55:53 +0000 |
| commit | 3cdacd4e6a2ca4c305c591dac8176828ae2e2b62 (patch) | |
| tree | b5c51b6e0db2c1aadb03e80b148b3b9a0c9ef4f6 /chrome/browser/first_run_win.cc | |
| parent | 980539163f30d19e5adff1538122b1ea6a0e4803 (diff) | |
| download | chromium_src-3cdacd4e6a2ca4c305c591dac8176828ae2e2b62.zip chromium_src-3cdacd4e6a2ca4c305c591dac8176828ae2e2b62.tar.gz chromium_src-3cdacd4e6a2ca4c305c591dac8176828ae2e2b62.tar.bz2 | |
r46025 reverted r46023 which caused a build break on chromeos.
This change reverts r46025 and fixes the build break which is just a one line
change in chrome/browser/first_run_gtk.cc to move the definition of
Upgrade::new_command_line_ to be inside a #if. Details on the change and code
review feedback for the original CL can be found at
http://codereview.chromium.org/1633021.
BUG=40975
TEST=none
Review URL: http://codereview.chromium.org/1691022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run_win.cc')
| -rw-r--r-- | chrome/browser/first_run_win.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc index cc34dc1..86a79e5 100644 --- a/chrome/browser/first_run_win.cc +++ b/chrome/browser/first_run_win.cc @@ -205,6 +205,8 @@ 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)) @@ -410,6 +412,18 @@ 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)) @@ -1020,4 +1034,3 @@ Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) { TryChromeDialog td; return td.ShowModal(); } - |