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

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

Issue 10665002: Implement installation of the Chrome App Host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittests. Created 8 years, 5 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 cebe50cb944ae804c953d4f97cfe37b9f032580d..6c9f5be1632b12e8b4aa245c22cd16effd9bb600 100644
--- a/chrome/installer/mini_installer/configuration.cc
+++ b/chrome/installer/mini_installer/configuration.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -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_);
}
return args_ != NULL;
}

Powered by Google App Engine
This is Rietveld 408576698