OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/installer/util/google_update_util.h" | 5 #include "chrome/installer/util/google_update_util.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/process/kill.h" | 12 #include "base/process/kill.h" |
13 #include "base/process/launch.h" | 13 #include "base/process/launch.h" |
14 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
15 #include "base/time/time.h" | 15 #include "base/time/time.h" |
16 #include "base/win/registry.h" | 16 #include "base/win/registry.h" |
17 #include "base/win/scoped_handle.h" | 17 #include "base/win/scoped_handle.h" |
18 #include "base/win/win_util.h" | 18 #include "base/win/win_util.h" |
19 #include "base/win/windows_version.h" | |
20 #include "chrome/installer/util/browser_distribution.h" | 19 #include "chrome/installer/util/browser_distribution.h" |
21 #include "chrome/installer/util/google_update_constants.h" | 20 #include "chrome/installer/util/google_update_constants.h" |
22 #include "chrome/installer/util/google_update_settings.h" | 21 #include "chrome/installer/util/google_update_settings.h" |
23 #include "chrome/installer/util/install_util.h" | 22 #include "chrome/installer/util/install_util.h" |
24 #include "chrome/installer/util/installation_state.h" | 23 #include "chrome/installer/util/installation_state.h" |
25 #include "chrome/installer/util/product.h" | 24 #include "chrome/installer/util/product.h" |
26 | 25 |
27 using base::win::RegKey; | 26 using base::win::RegKey; |
28 | 27 |
29 namespace google_update { | 28 namespace google_update { |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 if (system_install) | 170 if (system_install) |
172 cmd.AppendSwitch(installer::switches::kSystemLevel); | 171 cmd.AppendSwitch(installer::switches::kSystemLevel); |
173 if (product_state.uninstall_command().HasSwitch( | 172 if (product_state.uninstall_command().HasSwitch( |
174 installer::switches::kVerboseLogging)) { | 173 installer::switches::kVerboseLogging)) { |
175 cmd.AppendSwitch(installer::switches::kVerboseLogging); | 174 cmd.AppendSwitch(installer::switches::kVerboseLogging); |
176 } | 175 } |
177 | 176 |
178 base::LaunchOptions launch_options; | 177 base::LaunchOptions launch_options; |
179 launch_options.force_breakaway_from_job_ = true; | 178 launch_options.force_breakaway_from_job_ = true; |
180 | 179 |
181 if (base::win::GetVersion() >= base::win::VERSION_VISTA && | 180 if (base::win::UserAccountControlIsEnabled()) |
182 base::win::UserAccountControlIsEnabled()) { | |
183 base::LaunchElevatedProcess(cmd, launch_options); | 181 base::LaunchElevatedProcess(cmd, launch_options); |
184 } else { | 182 else |
185 base::LaunchProcess(cmd, launch_options); | 183 base::LaunchProcess(cmd, launch_options); |
186 } | |
187 } | 184 } |
188 | 185 |
189 } // namespace google_update | 186 } // namespace google_update |
OLD | NEW |