diff options
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/install_worker.cc | 12 | ||||
| -rw-r--r-- | chrome/installer/setup/install_worker.h | 2 | ||||
| -rw-r--r-- | chrome/installer/setup/uninstall.cc | 6 | ||||
| -rw-r--r-- | chrome/installer/util/installation_validator.cc | 2 | ||||
| -rw-r--r-- | chrome/installer/util/installation_validator_unittest.cc | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index f23736c..3929d07 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -1114,9 +1114,9 @@ void AddInstallWorkItems(const InstallationState& original_state, // Copy over brand, usagestats, and other values. AddGoogleUpdateWorkItems(original_state, installer_state, install_list); - AddQuickEnableApplicationHostWorkItems(installer_state, original_state, - setup_path, new_version, - install_list); + AddQuickEnableApplicationLauncherWorkItems(installer_state, original_state, + setup_path, new_version, + install_list); AddQuickEnableChromeFrameWorkItems(installer_state, original_state, setup_path, new_version, install_list); @@ -1553,7 +1553,7 @@ void AddQuickEnableChromeFrameWorkItems(const InstallerState& installer_state, work_item_list); } -void AddQuickEnableApplicationHostWorkItems( +void AddQuickEnableApplicationLauncherWorkItems( const InstallerState& installer_state, const InstallationState& machine_state, const FilePath& setup_path, @@ -1563,11 +1563,11 @@ void AddQuickEnableApplicationHostWorkItems( CommandLine cmd_line(CommandLine::NO_PROGRAM); cmd_line.AppendSwitch(switches::kMultiInstall); - cmd_line.AppendSwitch(switches::kChromeAppHost); + cmd_line.AppendSwitch(switches::kChromeAppLauncher); cmd_line.AppendSwitch(switches::kEnsureGoogleUpdatePresent); // For system-level binaries there is no way to keep the command state in sync - // with the installation/uninstallation of the Application Host (which is + // with the installation/uninstallation of the Application Launcher (which is // always at user-level). // So we pass false for 'have_child_product' to cause this command to always // be installed if the Chrome Binaries are installed. diff --git a/chrome/installer/setup/install_worker.h b/chrome/installer/setup/install_worker.h index 3a64d1e..a303b28 100644 --- a/chrome/installer/setup/install_worker.h +++ b/chrome/installer/setup/install_worker.h @@ -198,7 +198,7 @@ void AddQuickEnableChromeFrameWorkItems(const InstallerState& installer_state, // product(s) currently being installed) are required when processing product // installation; they are unused ((and may therefore be empty) when // uninstalling). -void AddQuickEnableApplicationHostWorkItems( +void AddQuickEnableApplicationLauncherWorkItems( const InstallerState& installer_state, const InstallationState& machine_state, const FilePath& setup_path, diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index d670288..0dcafee 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -150,9 +150,9 @@ void ProcessQuickEnableWorkItems( AddQuickEnableChromeFrameWorkItems(installer_state, machine_state, FilePath(), Version(), work_item_list.get()); - AddQuickEnableApplicationHostWorkItems(installer_state, machine_state, - FilePath(), Version(), - work_item_list.get()); + AddQuickEnableApplicationLauncherWorkItems(installer_state, machine_state, + FilePath(), Version(), + work_item_list.get()); if (!work_item_list->Do()) LOG(ERROR) << "Failed to update quick-enable-cf command."; } diff --git a/chrome/installer/util/installation_validator.cc b/chrome/installer/util/installation_validator.cc index 0c538b4b..23740eb 100644 --- a/chrome/installer/util/installation_validator.cc +++ b/chrome/installer/util/installation_validator.cc @@ -321,7 +321,7 @@ void InstallationValidator::ValidateQuickEnableApplicationHostCommand( SwitchExpectations expected; expected.push_back(std::make_pair( - std::string(switches::kChromeAppHost), true)); + std::string(switches::kChromeAppLauncher), true)); expected.push_back(std::make_pair( std::string(switches::kSystemLevel), false)); expected.push_back(std::make_pair( diff --git a/chrome/installer/util/installation_validator_unittest.cc b/chrome/installer/util/installation_validator_unittest.cc index c3b03a3..5b2b4eb 100644 --- a/chrome/installer/util/installation_validator_unittest.cc +++ b/chrome/installer/util/installation_validator_unittest.cc @@ -213,7 +213,7 @@ void FakeProductState::AddQuickEnableApplicationHostCommand( CommandLine cmd_line(GetSetupExePath(dist_type, install_level, version, channel_modifiers)); cmd_line.AppendSwitch(installer::switches::kMultiInstall); - cmd_line.AppendSwitch(installer::switches::kChromeAppHost); + cmd_line.AppendSwitch(installer::switches::kChromeAppLauncher); cmd_line.AppendSwitch(installer::switches::kEnsureGoogleUpdatePresent); AppCommand app_cmd(cmd_line.GetCommandLineString()); app_cmd.set_sends_pings(true); |