Added master_preferences to control shortcuts on windows.

chrome/installer/util/master_preferences.cc

 // 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.
 
 #include "chrome/installer/util/master_preferences.h"
 
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/lazy_instance.h"
@@ skipping 208 matching lines @@
     master_dictionary_.reset(new DictionaryValue());
     data_is_valid = false;
   } else {
     // Cache a pointer to the distribution dictionary.
     master_dictionary_->GetDictionary(
         installer::master_preferences::kDistroDict, &distribution_);
   }
 
   InitializeProductFlags();
   EnforceLegacyPreferences();
+  EnforceShorcutPreferences();
   return data_is_valid;
 }
 
 void MasterPreferences::InitializeProductFlags() {
   // Make sure we start out with the correct defaults.
   multi_install_ = false;
   chrome_frame_ = false;
   chrome_app_launcher_ = false;
   chrome_ = true;
 
@@ skipping 33 matching lines @@
   GetBool(installer::master_preferences::kCreateAllShortcuts,
           &create_all_shortcuts);
   if (!create_all_shortcuts) {
     distribution_->SetBoolean(
         installer::master_preferences::kDoNotCreateDesktopShortcut, true);
     distribution_->SetBoolean(
         installer::master_preferences::kDoNotCreateQuickLaunchShortcut, true);
   }
 }
 
+void MasterPreferences::EnforceShorcutPreferences() {

[gab, 2013/03/06 20:20:32]

As mentioned in install.cc I would prefer that "do_not_create_any_shortcuts"
simply result in an early return from CreateOrUpdateShortcuts() instead of
actually enabling the other prefs.

The less coupled preferences are the easier to maintain, i.e.: with this design
if we want to later add do_not_create_start_menu_shortcut we have to make sure
it is enforced here; where as if do_not_create_any_shortcuts only causes an
early return it automatically enforces all the do_not_create_*_shortcut without
explicitly coupling them.

[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_)
     ret = distribution_->GetBoolean(name, value);
   return ret;
 }
 
 bool MasterPreferences::GetInt(const std::string& name, int* value) const {
   bool ret = false;
   if (distribution_)
@@ skipping 23 matching lines @@
   master_dictionary_->GetString(prefs::kVariationsSeed, &variations_seed);
   return variations_seed;
 }
 
 // static
 const MasterPreferences& MasterPreferences::ForCurrentProcess() {
   return g_master_preferences.Get();
 }
 
 }  // namespace installer