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

Side by Side Diff: chrome/browser/first_run/upgrade_win.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_util_win.cc ('k') | chrome/browser/process_singleton.h » ('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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 command_line.command_line_string(), false, false, NULL); 148 command_line.command_line_string(), false, false, NULL);
149 } 149 }
150 150
151 // static 151 // static
152 bool Upgrade::IsUpdatePendingRestart() { 152 bool Upgrade::IsUpdatePendingRestart() {
153 FilePath new_chrome_exe; 153 FilePath new_chrome_exe;
154 if (!GetNewerChromeFile(&new_chrome_exe)) 154 if (!GetNewerChromeFile(&new_chrome_exe))
155 return false; 155 return false;
156 return file_util::PathExists(new_chrome_exe); 156 return file_util::PathExists(new_chrome_exe);
157 } 157 }
OLDNEW
« no previous file with comments | « chrome/browser/first_run/upgrade_util_win.cc ('k') | chrome/browser/process_singleton.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698