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

Unified Diff: chrome/installer/util/master_preferences.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/util/master_preferences.cc
diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index 008c148bf2b914d944313b0e413fb5c25a056060..59f72708cdee250894821fcb67dd2aa5787951ed 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -82,6 +82,7 @@ namespace installer {
MasterPreferences::MasterPreferences() : distribution_(NULL),
preferences_read_from_file_(false),
chrome_(true),
+ chrome_app_host_(false),
chrome_frame_(false),
multi_install_(false) {
InitializeFromCommandLine(*CommandLine::ForCurrentProcess());
@@ -91,6 +92,7 @@ MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
: distribution_(NULL),
preferences_read_from_file_(false),
chrome_(true),
+ chrome_app_host_(false),
chrome_frame_(false),
multi_install_(false) {
InitializeFromCommandLine(cmd_line);
@@ -98,7 +100,8 @@ MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
MasterPreferences::MasterPreferences(const FilePath& prefs_path)
: distribution_(NULL), preferences_read_from_file_(false),
- chrome_(true), chrome_frame_(false), multi_install_(false) {
+ chrome_(true), chrome_app_host_(false), chrome_frame_(false),
+ multi_install_(false) {
master_dictionary_.reset(ParseDistributionPreferences(prefs_path));
if (!master_dictionary_.get()) {
@@ -136,6 +139,8 @@ void MasterPreferences::InitializeFromCommandLine(const CommandLine& cmd_line) {
} translate_switches[] = {
{ installer::switches::kAutoLaunchChrome,
installer::master_preferences::kAutoLaunchChrome },
+ { installer::switches::kChromeAppHost,
+ installer::master_preferences::kChromeAppHost },
{ installer::switches::kChrome,
installer::master_preferences::kChrome },
{ installer::switches::kChromeFrame,
@@ -207,10 +212,12 @@ void MasterPreferences::InitializeProductFlags() {
// Make sure we start out with the correct defaults.
multi_install_ = false;
chrome_frame_ = false;
+ chrome_app_host_ = false;
chrome_ = true;
GetBool(installer::master_preferences::kMultiInstall, &multi_install_);
GetBool(installer::master_preferences::kChromeFrame, &chrome_frame_);
+ GetBool(installer::master_preferences::kChromeAppHost, &chrome_app_host_);
// When multi-install is specified, the checks are pretty simple (in theory):
// In order to be installed/uninstalled, each product must have its switch

Powered by Google App Engine
This is Rietveld 408576698