Index: chrome/installer/util/installer_state.cc |
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc |
index e3d1396a2b72de10e1970487d6c5ea21814bd130..e1d415fb931fe8158c9bd325903308fa028bcb38 100644 |
--- a/chrome/installer/util/installer_state.cc |
+++ b/chrome/installer/util/installer_state.cc |
@@ -94,7 +94,7 @@ InstallerState::InstallerState(Level level) |
set_level(level); |
} |
-void InstallerState::Initialize(const CommandLine& command_line, |
+bool InstallerState::Initialize(const CommandLine& command_line, |
const MasterPreferences& prefs, |
const InstallationState& machine_state) { |
bool pref_bool; |
@@ -131,7 +131,15 @@ void InstallerState::Initialize(const CommandLine& command_line, |
VLOG(1) << (is_uninstall ? "Uninstall" : "Install") |
<< " distribution: " << p->distribution()->GetAppShortCutName(); |
} |
- if (prefs.install_chrome_app_host()) { |
+ if (prefs.install_chrome_app_launcher() || prefs.install_chrome_app_host()) { |
erikwright (departed)
2012/10/25 02:23:03
It seems OK to me just to simplify this by treatin
huangs
2012/10/29 21:15:16
Done. So --app-host + --app-launcher = --app-launc
|
+ // TODO(huangs): Revisit all these once App Launcher is default. |
+ if (prefs.install_chrome_app_launcher() && |
+ prefs.install_chrome_app_host()) { |
+ LOG(ERROR) << "Cannot have --" << installer::switches::kChromeAppHost |
+ << " with --" << installer::switches::kChromeAppLauncher; |
+ return false; |
+ } |
+ |
Product* p = |
AddProductFromPreferences(BrowserDistribution::CHROME_APP_HOST, prefs, |
machine_state); |
@@ -284,6 +292,7 @@ void InstallerState::Initialize(const CommandLine& command_line, |
std::string critical_version_value( |
command_line.GetSwitchValueASCII(switches::kCriticalUpdateVersion)); |
critical_update_version_ = Version(critical_version_value); |
+ return true; |
} |
void InstallerState::set_level(Level level) { |