| Index: chrome/installer/util/installer_state.cc
|
| diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
|
| index 13d57947b1a16322de9ec83282e2a3bf1d93544a..e3d1396a2b72de10e1970487d6c5ea21814bd130 100644
|
| --- a/chrome/installer/util/installer_state.cc
|
| +++ b/chrome/installer/util/installer_state.cc
|
| @@ -76,7 +76,8 @@ InstallerState::InstallerState()
|
| state_type_(BrowserDistribution::CHROME_BROWSER),
|
| root_key_(NULL),
|
| msi_(false),
|
| - verbose_logging_(false) {
|
| + verbose_logging_(false),
|
| + ensure_google_update_present_(false) {
|
| }
|
|
|
| InstallerState::InstallerState(Level level)
|
| @@ -87,7 +88,8 @@ InstallerState::InstallerState(Level level)
|
| state_type_(BrowserDistribution::CHROME_BROWSER),
|
| root_key_(NULL),
|
| msi_(false),
|
| - verbose_logging_(false) {
|
| + verbose_logging_(false),
|
| + ensure_google_update_present_(false) {
|
| // Use set_level() so that root_key_ is updated properly.
|
| set_level(level);
|
| }
|
| @@ -110,6 +112,9 @@ void InstallerState::Initialize(const CommandLine& command_line,
|
| if (!prefs.GetBool(master_preferences::kMsi, &msi_))
|
| msi_ = false;
|
|
|
| + ensure_google_update_present_ =
|
| + command_line.HasSwitch(installer::switches::kEnsureGoogleUpdatePresent);
|
| +
|
| const bool is_uninstall = command_line.HasSwitch(switches::kUninstall);
|
|
|
| if (prefs.install_chrome()) {
|
|
|