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

Side by Side Diff: chrome/installer/setup/installer_state.cc

Issue 2459583002: Use InstallDetails in setup. (Closed)
Patch Set: another doc comment Created 3 years, 10 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
OLDNEW
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/setup/installer_state.h" 5 #include "chrome/installer/setup/installer_state.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/files/file_util.h" 13 #include "base/files/file_util.h"
14 #include "base/win/registry.h" 14 #include "base/win/registry.h"
15 #include "chrome/install_static/install_modes.h"
15 #include "chrome/installer/setup/setup_util.h" 16 #include "chrome/installer/setup/setup_util.h"
16 #include "chrome/installer/util/app_registration_data.h" 17 #include "chrome/installer/util/app_registration_data.h"
17 #include "chrome/installer/util/google_update_settings.h" 18 #include "chrome/installer/util/google_update_settings.h"
18 #include "chrome/installer/util/helper.h" 19 #include "chrome/installer/util/helper.h"
19 #include "chrome/installer/util/install_util.h" 20 #include "chrome/installer/util/install_util.h"
20 #include "chrome/installer/util/installation_state.h" 21 #include "chrome/installer/util/installation_state.h"
21 #include "chrome/installer/util/master_preferences.h" 22 #include "chrome/installer/util/master_preferences.h"
22 #include "chrome/installer/util/master_preferences_constants.h" 23 #include "chrome/installer/util/master_preferences_constants.h"
23 #include "chrome/installer/util/product.h" 24 #include "chrome/installer/util/product.h"
24 #include "chrome/installer/util/work_item.h" 25 #include "chrome/installer/util/work_item.h"
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 // Write to the binaries on error if this is a migration back to 309 // Write to the binaries on error if this is a migration back to
309 // single-install for Google Chrome builds. Skip this for Chromium builds 310 // single-install for Google Chrome builds. Skip this for Chromium builds
310 // because they lump the "ClientState" and "Clients" keys into a single 311 // because they lump the "ClientState" and "Clients" keys into a single
311 // key. As a consequence, writing this value causes Software\Chromium to be 312 // key. As a consequence, writing this value causes Software\Chromium to be
312 // re-created after it was deleted during the migration to single-install. 313 // re-created after it was deleted during the migration to single-install.
313 // Google Chrome builds don't suffer this since the two keys are distinct 314 // Google Chrome builds don't suffer this since the two keys are distinct
314 // and have different lifetimes. The result is only written on failure since 315 // and have different lifetimes. The result is only written on failure since
315 // for success, the binaries have been uninstalled and therefore the result 316 // for success, the binaries have been uninstalled and therefore the result
316 // will not be read by Google Update. 317 // will not be read by Google Update.
317 InstallUtil::AddInstallerResultItems( 318 InstallUtil::AddInstallerResultItems(
318 system_install, MakeBinariesRegistrationData()->GetStateKey(), status, 319 system_install, install_static::GetBinariesClientStateKeyPath(), status,
319 string_resource_id, launch_cmd, install_list.get()); 320 string_resource_id, launch_cmd, install_list.get());
320 #endif 321 #endif
321 } 322 }
322 install_list->Do(); 323 install_list->Do();
323 } 324 }
324 325
325 bool InstallerState::RequiresActiveSetup() const { 326 bool InstallerState::RequiresActiveSetup() const {
326 return system_install(); 327 return system_install();
327 } 328 }
328 329
329 } // namespace installer 330 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/setup/install_worker_unittest.cc ('k') | chrome/installer/setup/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698