Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4338)

Unified Diff: chrome/installer/mini_installer/configuration.cc

Issue 811283002: [Installer] Cleaning up dead code for App Launcher / App Host installs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update .gn file; remove TODO's. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/mini_installer/configuration.cc
diff --git a/chrome/installer/mini_installer/configuration.cc b/chrome/installer/mini_installer/configuration.cc
index 023ed6cda02c88ce697ca2846e88b59095f7167e..33551cbebf44e27ac50e1739f4261f436bc42821 100644
--- a/chrome/installer/mini_installer/configuration.cc
+++ b/chrome/installer/mini_installer/configuration.cc
@@ -34,7 +34,6 @@ 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;
query_component_build_ = false;
@@ -61,9 +60,6 @@ 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")) ||
- (0 == ::lstrcmpi(args_[i], L"--app-launcher")))
- 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"))
@@ -76,8 +72,9 @@ bool Configuration::InitializeFromCommandLine(const wchar_t* command_line) {
// Single-install defaults to Chrome.
if (!is_multi_install_)
- has_chrome_ = !(has_chrome_frame_ || has_app_host_);
+ has_chrome_ = !has_chrome_frame_;
}
+
return args_ != NULL;
}

Powered by Google App Engine
This is Rietveld 408576698