summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup/setup_main.cc
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 21:58:56 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 21:58:56 +0000
commit5f8d121f337433a9426cfbbf87c4adbe93ce3459 (patch)
tree91dbc7227ebbab7ea7b63ed4dd05d1d820de951b /chrome/installer/setup/setup_main.cc
parent582bca833f4c2cc1d255c18c54f630f47cc35186 (diff)
downloadchromium_src-5f8d121f337433a9426cfbbf87c4adbe93ce3459.zip
chromium_src-5f8d121f337433a9426cfbbf87c4adbe93ce3459.tar.gz
chromium_src-5f8d121f337433a9426cfbbf87c4adbe93ce3459.tar.bz2
Fix distribution key bug.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/setup_main.cc')
-rw-r--r--chrome/installer/setup/setup_main.cc41
1 files changed, 18 insertions, 23 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index daae996..eb2e8ba 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -207,45 +207,42 @@ installer_util::InstallStatus RenameChromeExecutables(bool system_install) {
// Parse command line and read master profile, if present, to get distribution
// related install options.
DictionaryValue* GetInstallPreferences(const CommandLine& cmd_line) {
- DictionaryValue* preferences = NULL;
+ DictionaryValue* prefs = NULL;
if (cmd_line.HasSwitch(installer_util::switches::kInstallerData)) {
FilePath prefs_path(
cmd_line.GetSwitchValue(installer_util::switches::kInstallerData));
- preferences = installer_util::ParseDistributionPreferences(prefs_path);
- if (preferences)
- preferences->SetBoolean(
- installer_util::master_preferences::kMasterPreferencesValid, true);
+ prefs = installer_util::ParseDistributionPreferences(prefs_path);
}
- if (!preferences)
- preferences = new DictionaryValue();
+ if (!prefs)
+ prefs = new DictionaryValue();
if (cmd_line.HasSwitch(installer_util::switches::kCreateAllShortcuts))
- preferences->SetBoolean(
- installer_util::master_preferences::kCreateAllShortcuts, true);
+ installer_util::SetDistroBooleanPreference(
+ prefs, installer_util::master_preferences::kCreateAllShortcuts, true);
if (cmd_line.HasSwitch(installer_util::switches::kDoNotLaunchChrome))
- preferences->SetBoolean(
- installer_util::master_preferences::kDoNotLaunchChrome, true);
+ installer_util::SetDistroBooleanPreference(
+ prefs, installer_util::master_preferences::kDoNotLaunchChrome, true);
if (cmd_line.HasSwitch(installer_util::switches::kMakeChromeDefault))
- preferences->SetBoolean(
- installer_util::master_preferences::kMakeChromeDefault, true);
+ installer_util::SetDistroBooleanPreference(
+ prefs, installer_util::master_preferences::kMakeChromeDefault, true);
if (cmd_line.HasSwitch(installer_util::switches::kSystemLevel))
- preferences->SetBoolean(
- installer_util::master_preferences::kSystemLevel, true);
+ installer_util::SetDistroBooleanPreference(
+ prefs, installer_util::master_preferences::kSystemLevel, true);
if (cmd_line.HasSwitch(installer_util::switches::kVerboseLogging))
- preferences->SetBoolean(
- installer_util::master_preferences::kVerboseLogging, true);
+ installer_util::SetDistroBooleanPreference(
+ prefs, installer_util::master_preferences::kVerboseLogging, true);
if (cmd_line.HasSwitch(installer_util::switches::kAltDesktopShortcut))
- preferences->SetBoolean(
- installer_util::master_preferences::kAltShortcutText, true);
+ installer_util::SetDistroBooleanPreference(
+ prefs, installer_util::master_preferences::kAltShortcutText, true);
- return preferences;
+ return prefs;
}
// Copy master preferences file provided to installer, in the same folder
@@ -395,9 +392,7 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
install_msg_base, &chrome_exe);
if (install_status == installer_util::FIRST_INSTALL_SUCCESS) {
LOG(INFO) << "First install successful.";
- if (installer_util::GetDistroBooleanPreference(prefs,
- installer_util::master_preferences::kMasterPreferencesValid))
- CopyPreferenceFileForFirstRun(system_level, cmd_line);
+ CopyPreferenceFileForFirstRun(system_level, cmd_line);
// We never want to launch Chrome in system level install mode.
if (!system_level && !installer_util::GetDistroBooleanPreference(prefs,
installer_util::master_preferences::kDoNotLaunchChrome))