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

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

Issue 10957016: Ensuring Google Update at user-level is installed alongside App Host, for the quick-enable App Host… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Factoring Google Update execution code, since base::TimeDelta::FromMilliseconds(INFINITE) can be us… Created 8 years, 3 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
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 #ifndef CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ 5 #ifndef CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_
6 #define CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ 6 #define CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 Operation operation() const { return operation_; } 104 Operation operation() const { return operation_; }
105 105
106 // A convenience method returning level() == SYSTEM_LEVEL. 106 // A convenience method returning level() == SYSTEM_LEVEL.
107 // TODO(grt): Eradicate the bool in favor of the enum. 107 // TODO(grt): Eradicate the bool in favor of the enum.
108 bool system_install() const; 108 bool system_install() const;
109 109
110 // A convenience method returning package_type() == MULTI_PACKAGE. 110 // A convenience method returning package_type() == MULTI_PACKAGE.
111 // TODO(grt): Eradicate the bool in favor of the enum. 111 // TODO(grt): Eradicate the bool in favor of the enum.
112 bool is_multi_install() const; 112 bool is_multi_install() const;
113 113
114 // A convenient method returning the presence of the
115 // --ensure-google-update-present switch.
116 bool ensure_google_update_present() const {
117 return ensure_google_update_present_;
118 }
119
114 // The full path to the place where the operand resides. 120 // The full path to the place where the operand resides.
115 const FilePath& target_path() const { return target_path_; } 121 const FilePath& target_path() const { return target_path_; }
116 122
117 // True if the "msi" preference is set or if a product with the "msi" state 123 // True if the "msi" preference is set or if a product with the "msi" state
118 // flag is set is to be operated on. 124 // flag is set is to be operated on.
119 bool is_msi() const { return msi_; } 125 bool is_msi() const { return msi_; }
120 126
121 // True if the --verbose-logging command-line flag is set or if the 127 // True if the --verbose-logging command-line flag is set or if the
122 // verbose_logging master preferences option is true. 128 // verbose_logging master preferences option is true.
123 bool verbose_logging() const { return verbose_logging_; } 129 bool verbose_logging() const { return verbose_logging_; }
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 ScopedVector<Product> products_; 232 ScopedVector<Product> products_;
227 BrowserDistribution* multi_package_distribution_; 233 BrowserDistribution* multi_package_distribution_;
228 Version critical_update_version_; 234 Version critical_update_version_;
229 Level level_; 235 Level level_;
230 PackageType package_type_; 236 PackageType package_type_;
231 #if defined(OS_WIN) 237 #if defined(OS_WIN)
232 HKEY root_key_; 238 HKEY root_key_;
233 #endif 239 #endif
234 bool msi_; 240 bool msi_;
235 bool verbose_logging_; 241 bool verbose_logging_;
242 bool ensure_google_update_present_;
236 243
237 private: 244 private:
238 DISALLOW_COPY_AND_ASSIGN(InstallerState); 245 DISALLOW_COPY_AND_ASSIGN(InstallerState);
239 }; // class InstallerState 246 }; // class InstallerState
240 247
241 } // namespace installer 248 } // namespace installer
242 249
243 #endif // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ 250 #endif // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698