Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: chrome/browser/first_run/upgrade.cc

Issue 6835022: Broke ARM compile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/first_run/upgrade.h ('k') | chrome/browser/first_run/upgrade_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
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.h" 5 #include "chrome/browser/first_run/upgrade.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 // static 10 // static
11 void Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded() { 11 void Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded() {
12 if (new_command_line_) { 12 if (new_command_line_) {
13 if (!RelaunchChromeBrowser(*new_command_line_)) { 13 if (!RelaunchChromeBrowser(*new_command_line_)) {
14 DLOG(ERROR) << "Launching a new instance of the browser failed."; 14 DLOG(ERROR) << "Launching a new instance of the browser failed.";
15 } else { 15 } else {
16 DLOG(WARNING) << "Launched a new instance of the browser."; 16 DLOG(WARNING) << "Launched a new instance of the browser.";
17 } 17 }
18 delete new_command_line_; 18 delete new_command_line_;
19 new_command_line_ = NULL; 19 new_command_line_ = NULL;
20 } 20 }
21 } 21 }
OLDNEW
« no previous file with comments | « chrome/browser/first_run/upgrade.h ('k') | chrome/browser/first_run/upgrade_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698