| 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/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_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.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/launch.h" | 14 #include "base/process/launch.h" |
| 15 #include "chrome/browser/first_run/upgrade_util_linux.h" | 15 #include "chrome/browser/first_run/upgrade_util_linux.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 double saved_last_modified_time_of_exe = 0; | 19 double saved_last_modified_time_of_exe = 0; |
| 20 | 20 |
| 21 } // namespace | 21 } // namespace |
| 22 | 22 |
| 23 namespace upgrade_util { | 23 namespace upgrade_util { |
| 24 | 24 |
| 25 bool RelaunchChromeBrowser(const CommandLine& command_line) { | 25 bool RelaunchChromeBrowser(const CommandLine& command_line) { |
| 26 return base::LaunchProcess(command_line, base::LaunchOptions(), NULL); | 26 base::LaunchOptions options; |
| 27 // Don't set NO_NEW_PRIVS on the relaunched browser process. |
| 28 options.allow_new_privs = true; |
| 29 return base::LaunchProcess(command_line, options, NULL); |
| 27 } | 30 } |
| 28 | 31 |
| 29 bool IsUpdatePendingRestart() { | 32 bool IsUpdatePendingRestart() { |
| 30 return saved_last_modified_time_of_exe != GetLastModifiedTimeOfExe(); | 33 return saved_last_modified_time_of_exe != GetLastModifiedTimeOfExe(); |
| 31 } | 34 } |
| 32 | 35 |
| 33 void SaveLastModifiedTimeOfExe() { | 36 void SaveLastModifiedTimeOfExe() { |
| 34 saved_last_modified_time_of_exe = GetLastModifiedTimeOfExe(); | 37 saved_last_modified_time_of_exe = GetLastModifiedTimeOfExe(); |
| 35 } | 38 } |
| 36 | 39 |
| 37 double GetLastModifiedTimeOfExe() { | 40 double GetLastModifiedTimeOfExe() { |
| 38 base::FilePath exe_file_path; | 41 base::FilePath exe_file_path; |
| 39 if (!PathService::Get(base::FILE_EXE, &exe_file_path)) { | 42 if (!PathService::Get(base::FILE_EXE, &exe_file_path)) { |
| 40 LOG(WARNING) << "Failed to get base::FilePath object for FILE_EXE."; | 43 LOG(WARNING) << "Failed to get base::FilePath object for FILE_EXE."; |
| 41 return saved_last_modified_time_of_exe; | 44 return saved_last_modified_time_of_exe; |
| 42 } | 45 } |
| 43 base::File::Info exe_file_info; | 46 base::File::Info exe_file_info; |
| 44 if (!base::GetFileInfo(exe_file_path, &exe_file_info)) { | 47 if (!base::GetFileInfo(exe_file_path, &exe_file_info)) { |
| 45 LOG(WARNING) << "Failed to get FileInfo object for FILE_EXE - " | 48 LOG(WARNING) << "Failed to get FileInfo object for FILE_EXE - " |
| 46 << exe_file_path.value(); | 49 << exe_file_path.value(); |
| 47 return saved_last_modified_time_of_exe; | 50 return saved_last_modified_time_of_exe; |
| 48 } | 51 } |
| 49 return exe_file_info.last_modified.ToDoubleT(); | 52 return exe_file_info.last_modified.ToDoubleT(); |
| 50 } | 53 } |
| 51 | 54 |
| 52 } // namespace upgrade_util | 55 } // namespace upgrade_util |
| OLD | NEW |