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

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

Issue 6840003: first-run: Refactor Upgrade class into a common upgrade_util API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: upgrade_utils -> upgrade_util 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.cc ('k') | chrome/browser/first_run/upgrade_util_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_util.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/platform_file.h" 13 #include "base/platform_file.h"
14 #include "base/process_util.h" 14 #include "base/process_util.h"
15 15
16 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 16 namespace {
17 // static
18 CommandLine* Upgrade::new_command_line_ = NULL;
19 17
20 // static 18 double saved_last_modified_time_of_exe = 0;
21 double Upgrade::saved_last_modified_time_of_exe_ = 0;
22 19
23 // static 20 } // namespace
24 bool Upgrade::RelaunchChromeBrowser(const CommandLine& command_line) { 21
22 namespace upgrade_util {
23
24 bool RelaunchChromeBrowser(const CommandLine& command_line) {
25 return base::LaunchApp(command_line, false, false, NULL); 25 return base::LaunchApp(command_line, false, false, NULL);
26 } 26 }
27 27
28 // static 28 bool IsUpdatePendingRestart() {
29 void Upgrade::SaveLastModifiedTimeOfExe() { 29 return saved_last_modified_time_of_exe != GetLastModifiedTimeOfExe();
30 saved_last_modified_time_of_exe_ = Upgrade::GetLastModifiedTimeOfExe();
31 } 30 }
32 31
33 // static 32 void SaveLastModifiedTimeOfExe() {
34 bool Upgrade::IsUpdatePendingRestart() { 33 saved_last_modified_time_of_exe = GetLastModifiedTimeOfExe();
35 return saved_last_modified_time_of_exe_ !=
36 Upgrade::GetLastModifiedTimeOfExe();
37 } 34 }
38 35
39 // static 36 double GetLastModifiedTimeOfExe() {
40 double Upgrade::GetLastModifiedTimeOfExe() {
41 FilePath exe_file_path; 37 FilePath exe_file_path;
42 if (!PathService::Get(base::FILE_EXE, &exe_file_path)) { 38 if (!PathService::Get(base::FILE_EXE, &exe_file_path)) {
43 LOG(WARNING) << "Failed to get FilePath object for FILE_EXE."; 39 LOG(WARNING) << "Failed to get FilePath object for FILE_EXE.";
44 return saved_last_modified_time_of_exe_; 40 return saved_last_modified_time_of_exe;
45 } 41 }
46 base::PlatformFileInfo exe_file_info; 42 base::PlatformFileInfo exe_file_info;
47 if (!file_util::GetFileInfo(exe_file_path, &exe_file_info)) { 43 if (!file_util::GetFileInfo(exe_file_path, &exe_file_info)) {
48 LOG(WARNING) << "Failed to get FileInfo object for FILE_EXE - " 44 LOG(WARNING) << "Failed to get FileInfo object for FILE_EXE - "
49 << exe_file_path.value(); 45 << exe_file_path.value();
50 return saved_last_modified_time_of_exe_; 46 return saved_last_modified_time_of_exe;
51 } 47 }
52 return exe_file_info.last_modified.ToDoubleT(); 48 return exe_file_info.last_modified.ToDoubleT();
53 } 49 }
54 50
55 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 51 } // namespace upgrade_util
OLDNEW
« no previous file with comments | « chrome/browser/first_run/upgrade_util.cc ('k') | chrome/browser/first_run/upgrade_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698