OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/first_run/upgrade_util.h" | 5 #include "chrome/browser/first_run/upgrade_util.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 | 9 |
10 namespace { | 10 namespace { |
11 | 11 |
12 CommandLine* command_line; | 12 base::CommandLine* command_line; |
13 | 13 |
14 } // namespace | 14 } // namespace |
15 | 15 |
16 namespace upgrade_util { | 16 namespace upgrade_util { |
17 | 17 |
18 void SetNewCommandLine(CommandLine* new_command_line) { | 18 void SetNewCommandLine(base::CommandLine* new_command_line) { |
19 command_line = new_command_line; | 19 command_line = new_command_line; |
20 } | 20 } |
21 | 21 |
22 void RelaunchChromeBrowserWithNewCommandLineIfNeeded() { | 22 void RelaunchChromeBrowserWithNewCommandLineIfNeeded() { |
23 if (command_line) { | 23 if (command_line) { |
24 if (!RelaunchChromeBrowser(*command_line)) { | 24 if (!RelaunchChromeBrowser(*command_line)) { |
25 DLOG(ERROR) << "Launching a new instance of the browser failed."; | 25 DLOG(ERROR) << "Launching a new instance of the browser failed."; |
26 } else { | 26 } else { |
27 DLOG(WARNING) << "Launched a new instance of the browser."; | 27 DLOG(WARNING) << "Launched a new instance of the browser."; |
28 } | 28 } |
29 delete command_line; | 29 delete command_line; |
30 command_line = NULL; | 30 command_line = NULL; |
31 } | 31 } |
32 } | 32 } |
33 | 33 |
34 } // namespace upgrade_util | 34 } // namespace upgrade_util |
OLD | NEW |