Index: chrome/installer/mini_installer/configuration.cc |
diff --git a/chrome/installer/mini_installer/configuration.cc b/chrome/installer/mini_installer/configuration.cc |
index cebe50cb944ae804c953d4f97cfe37b9f032580d..e552bce9c6c531d2004e258dfb74f60b2ff17fbe 100644 |
--- a/chrome/installer/mini_installer/configuration.cc |
+++ b/chrome/installer/mini_installer/configuration.cc |
@@ -34,6 +34,7 @@ void Configuration::Clear() { |
argument_count_ = 0; |
has_chrome_ = false; |
has_chrome_frame_ = false; |
+ has_app_host_ = false; |
is_multi_install_ = false; |
is_system_level_ = false; |
} |
@@ -59,6 +60,8 @@ bool Configuration::InitializeFromCommandLine(const wchar_t* command_line) { |
has_chrome_ = true; |
else if (0 == ::lstrcmpi(args_[i], L"--chrome-frame")) |
has_chrome_frame_ = true; |
+ else if (0 == ::lstrcmpi(args_[i], L"--app-host")) |
+ has_app_host_ = true; |
else if (0 == ::lstrcmpi(args_[i], L"--multi-install")) |
is_multi_install_ = true; |
else if (0 == ::lstrcmpi(args_[i], L"--system-level")) |
@@ -67,9 +70,9 @@ bool Configuration::InitializeFromCommandLine(const wchar_t* command_line) { |
operation_ = CLEANUP; |
} |
- // Single-install is either Chrome or Chrome Frame. |
+ // Single-install defaults to Chrome. |
if (!is_multi_install_) |
- has_chrome_ = !has_chrome_frame_; |
+ has_chrome_ = !(has_chrome_frame_ || has_app_host_); |
grt (UTC plus 2)
2012/07/12 18:37:10
is more needed here? what happens if --app-host i
erikwright (departed)
2012/07/16 20:13:11
I think I'd rather leave this class responsible fo
|
} |
return args_ != NULL; |
} |