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

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

Issue 1121633002: win: Work on reducing number of style plugin warnings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 7 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/util/installer_state.h" 5 #include "chrome/installer/util/installer_state.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 multi_package_distribution_(NULL), 79 multi_package_distribution_(NULL),
80 level_(UNKNOWN_LEVEL), 80 level_(UNKNOWN_LEVEL),
81 package_type_(UNKNOWN_PACKAGE_TYPE), 81 package_type_(UNKNOWN_PACKAGE_TYPE),
82 root_key_(NULL), 82 root_key_(NULL),
83 msi_(false), 83 msi_(false),
84 verbose_logging_(false) { 84 verbose_logging_(false) {
85 // Use set_level() so that root_key_ is updated properly. 85 // Use set_level() so that root_key_ is updated properly.
86 set_level(level); 86 set_level(level);
87 } 87 }
88 88
89 InstallerState::~InstallerState() {
90 }
91
89 void InstallerState::Initialize(const base::CommandLine& command_line, 92 void InstallerState::Initialize(const base::CommandLine& command_line,
90 const MasterPreferences& prefs, 93 const MasterPreferences& prefs,
91 const InstallationState& machine_state) { 94 const InstallationState& machine_state) {
92 Clear(); 95 Clear();
93 96
94 bool pref_bool; 97 bool pref_bool;
95 if (!prefs.GetBool(master_preferences::kSystemLevel, &pref_bool)) 98 if (!prefs.GetBool(master_preferences::kSystemLevel, &pref_bool))
96 pref_bool = false; 99 pref_bool = false;
97 set_level(pref_bool ? SYSTEM_LEVEL : USER_LEVEL); 100 set_level(pref_bool ? SYSTEM_LEVEL : USER_LEVEL);
98 101
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 } 686 }
684 if (!install_list->Do()) 687 if (!install_list->Do())
685 LOG(ERROR) << "Failed to record installer error information in registry."; 688 LOG(ERROR) << "Failed to record installer error information in registry.";
686 } 689 }
687 690
688 bool InstallerState::RequiresActiveSetup() const { 691 bool InstallerState::RequiresActiveSetup() const {
689 return system_install() && FindProduct(BrowserDistribution::CHROME_BROWSER); 692 return system_install() && FindProduct(BrowserDistribution::CHROME_BROWSER);
690 } 693 }
691 694
692 } // namespace installer 695 } // namespace installer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698