Chromium Code Reviews| Index: chrome/installer/util/master_preferences.cc |
| diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc |
| index 27c4ff113eded90b5c19ba0ae14af4affdd8f259..9799fb52981c12101d34df2b7e18321595f903cc 100644 |
| --- a/chrome/installer/util/master_preferences.cc |
| +++ b/chrome/installer/util/master_preferences.cc |
| @@ -226,6 +226,7 @@ bool MasterPreferences::InitializeFromString(const std::string& json_data) { |
| InitializeProductFlags(); |
| EnforceLegacyPreferences(); |
| + EnforceShorcutPreferences(); |
| return data_is_valid; |
| } |
| @@ -279,6 +280,23 @@ void MasterPreferences::EnforceLegacyPreferences() { |
| } |
| } |
| +void MasterPreferences::EnforceShorcutPreferences() { |
|
gab
2013/03/06 20:20:32
As mentioned in install.cc I would prefer that "do
Joao da Silva
2013/03/06 21:21:33
Agreed, done.
|
| + bool do_not_create_any_shortcuts = false; |
| + GetBool(installer::master_preferences::kDoNotCreateAnyShortcuts, |
| + &do_not_create_any_shortcuts); |
| + if (do_not_create_any_shortcuts) { |
| + // do_not_create_any_shortcuts overrides all these preferences. |
| + distribution_->SetBoolean( |
| + installer::master_preferences::kDoNotCreateDesktopShortcut, true); |
| + distribution_->SetBoolean( |
| + installer::master_preferences::kDoNotCreateQuickLaunchShortcut, true); |
| + distribution_->SetBoolean( |
| + installer::master_preferences::kDoNotCreateTaskbarShortcut, true); |
| + distribution_->SetBoolean( |
| + installer::master_preferences::kCreateAllShortcuts, false); |
| + } |
| +} |
| + |
| bool MasterPreferences::GetBool(const std::string& name, bool* value) const { |
| bool ret = false; |
| if (distribution_) |