Chromium Code Reviews| 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 #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 <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 | 114 // A convenient method returning the presence of the |
|
grt (UTC plus 2)
2013/05/16 14:55:52
convenient -> convenience (The former means the me
huangs
2013/05/17 20:59:24
Done.
| |
| 115 // --ensure-google-update-present switch. | 115 // --ensure-google-update-present switch. |
| 116 bool ensure_google_update_present() const { | 116 bool ensure_google_update_present() const { |
| 117 return ensure_google_update_present_; | 117 return ensure_google_update_present_; |
| 118 } | 118 } |
| 119 | 119 |
| 120 // A convenient method returning the presence of legacy App Launcher (with | |
|
grt (UTC plus 2)
2013/05/16 14:55:52
I don't think this method is a convenience in the
huangs
2013/05/17 20:59:24
Done (minor rephrasing).
| |
| 121 // its own Add/Remove entry, and app_host.exe), which requires migration. | |
| 122 bool need_to_migrate_legacy_app_launcher() const { | |
| 123 return need_to_migrate_legacy_app_launcher_; | |
| 124 } | |
| 125 | |
| 126 // A convenient method returning the need to create shortcuts for the | |
|
grt (UTC plus 2)
2013/05/16 14:55:52
Similar comment as above. How about "Returns true
huangs
2013/05/17 20:59:24
Done (minor rephrasing).
| |
| 127 // App Launcher, as specified by the --app-launcher switch. | |
| 128 bool create_app_launcher_shortcuts() const { | |
| 129 return create_app_launcher_shortcuts_; | |
| 130 } | |
| 131 | |
| 120 // The full path to the place where the operand resides. | 132 // The full path to the place where the operand resides. |
| 121 const base::FilePath& target_path() const { return target_path_; } | 133 const base::FilePath& target_path() const { return target_path_; } |
| 122 | 134 |
| 123 // True if the "msi" preference is set or if a product with the "msi" state | 135 // True if the "msi" preference is set or if a product with the "msi" state |
| 124 // flag is set is to be operated on. | 136 // flag is set is to be operated on. |
| 125 bool is_msi() const { return msi_; } | 137 bool is_msi() const { return msi_; } |
| 126 | 138 |
| 127 // True if the --verbose-logging command-line flag is set or if the | 139 // True if the --verbose-logging command-line flag is set or if the |
| 128 // verbose_logging master preferences option is true. | 140 // verbose_logging master preferences option is true. |
| 129 bool verbose_logging() const { return verbose_logging_; } | 141 bool verbose_logging() const { return verbose_logging_; } |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 246 BrowserDistribution* multi_package_distribution_; | 258 BrowserDistribution* multi_package_distribution_; |
| 247 base::Version critical_update_version_; | 259 base::Version critical_update_version_; |
| 248 Level level_; | 260 Level level_; |
| 249 PackageType package_type_; | 261 PackageType package_type_; |
| 250 #if defined(OS_WIN) | 262 #if defined(OS_WIN) |
| 251 HKEY root_key_; | 263 HKEY root_key_; |
| 252 #endif | 264 #endif |
| 253 bool msi_; | 265 bool msi_; |
| 254 bool verbose_logging_; | 266 bool verbose_logging_; |
| 255 bool ensure_google_update_present_; | 267 bool ensure_google_update_present_; |
| 268 // TODO(huangs): Remove by M30. | |
| 269 bool need_to_migrate_legacy_app_launcher_; | |
| 270 // TODO(huangs): Remove by M30. | |
| 271 bool create_app_launcher_shortcuts_; | |
| 256 | 272 |
| 257 private: | 273 private: |
| 258 DISALLOW_COPY_AND_ASSIGN(InstallerState); | 274 DISALLOW_COPY_AND_ASSIGN(InstallerState); |
| 259 }; // class InstallerState | 275 }; // class InstallerState |
| 260 | 276 |
| 261 } // namespace installer | 277 } // namespace installer |
| 262 | 278 |
| 263 #endif // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ | 279 #endif // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ |
| OLD | NEW |