Prevent accelerators from toggling the bookmark bar when disabled by policy.

chrome/browser/policy/configuration_policy_pref_store.cc

 // Copyright (c) 2011 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/browser/policy/configuration_policy_pref_store.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 88 matching lines @@
   // ApplyFileSelectionDialogsPolicy assumes the ownership of |value| in the
   // case that the policy is recognized.
   bool ApplyFileSelectionDialogsPolicy(ConfigurationPolicyType policy,
                                        Value* value);
 
   // Processes default search provider policies. Returns true if the specified
   // policy is a default search provider related policy. In that case,
   // ApplyDefaultSearchPolicy takes ownership of |value|.
   bool ApplyDefaultSearchPolicy(ConfigurationPolicyType policy, Value* value);
 
+  // Processes a policy that can disable the bookmarks bar. It can also affect
+  // other preferences.
+  bool ApplyBookmarksPolicy(ConfigurationPolicyType policy, Value* value);
+
   // Make sure that the |path| if present in |prefs_|.  If not, set it to
   // a blank string.
   void EnsureStringPrefExists(const std::string& path);
 
   // If the required entries for default search are specified and valid,
   // finalizes the policy-specified configuration by initializing the
   // unspecified map entries.  Otherwise wipes all default search related
   // map entries from |prefs_|.
   void FinalizeDefaultSearchPolicySettings();
 
@@ skipping 145 matching lines @@
   { Value::TYPE_BOOLEAN, kPolicyInstantEnabled, prefs::kInstantEnabled },
   { Value::TYPE_BOOLEAN, kPolicyDefaultBrowserSettingEnabled,
     prefs::kDefaultBrowserSettingEnabled },
   { Value::TYPE_BOOLEAN, kPolicyRemoteAccessClientFirewallTraversal,
     prefs::kRemoteAccessClientFirewallTraversal },
   { Value::TYPE_BOOLEAN, kPolicyRemoteAccessHostFirewallTraversal,
     prefs::kRemoteAccessHostFirewallTraversal },
   { Value::TYPE_BOOLEAN, kPolicyCloudPrintProxyEnabled,
     prefs::kCloudPrintProxyEnabled },
   { Value::TYPE_BOOLEAN, kPolicyTranslateEnabled, prefs::kEnableTranslate },
-  { Value::TYPE_BOOLEAN, kPolicyBookmarkBarEnabled, prefs::kEnableBookmarkBar },
   { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins,
     prefs::kPluginsAllowOutdated },
   { Value::TYPE_BOOLEAN, kPolicyAlwaysAuthorizePlugins,
     prefs::kPluginsAlwaysAuthorize },
   { Value::TYPE_BOOLEAN, kPolicyEditBookmarksEnabled,
     prefs::kEditBookmarksEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs,
-    prefs::kAllowFileSelectionDialogs },
   { Value::TYPE_INTEGER, kPolicyMaxConnectionsPerProxy,
     prefs::kMaxConnectionsPerProxy },
 
 #if defined(OS_CHROMEOS)
   { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend,
     prefs::kEnableScreenLock },
   { Value::TYPE_STRING, kPolicyChromeOsReleaseChannel,
     prefs::kChromeOsReleaseChannel },
 #endif
 };
@@ skipping 69 matching lines @@
 
   if (ApplyDiskCacheDirPolicy(policy, value))
     return;
 
   if (ApplyFileSelectionDialogsPolicy(policy, value))
     return;
 
   if (ApplyDefaultSearchPolicy(policy, value))
     return;
 
+  if (ApplyBookmarksPolicy(policy, value))

[Peter Kasting, 2011/08/04 18:44:43]

Nit: Shorter would be

if (ApplyXYZPolicy(policy, value) ||
    ApplyABCPolicy(policy, value) ||
    ...
  return;

[Joao da Silva, 2011/08/05 09:24:11]

Done.

+    return;
+
   if (ApplyPolicyFromMap(policy, value, kSimplePolicyMap,
                          arraysize(kSimplePolicyMap)))
     return;
 
   // Other policy implementations go here.
   NOTIMPLEMENTED();
   delete value;
 }
 
 bool ConfigurationPolicyPrefKeeper::RemovePreferencesOfMap(
@@ skipping 167 matching lines @@
     return true;
   }
 
   if (ApplyPolicyFromMap(policy, value, kDefaultSearchPolicyMap,
                          arraysize(kDefaultSearchPolicyMap))) {
     return true;
   }
   return false;
 }
 
+bool ConfigurationPolicyPrefKeeper::ApplyBookmarksPolicy(
+    ConfigurationPolicyType policy,
+    Value* value) {
+  if (policy != kPolicyBookmarkBarEnabled)
+    return false;
+  DCHECK_EQ(Value::TYPE_BOOLEAN, value->GetType());
+  prefs_.SetValue(prefs::kEnableBookmarkBar, value);
+  // kShowBookmarkBar is not managed directly by a policy, but when
+  // kEnableBookmarkBar is managed, kShowBookmarkBar should be false so that
+  // the bookmarks bar either is completely disabled or only shows on the NTP.

[Peter Kasting, 2011/08/04 18:44:43]

There's no policy configuration that corresponds to "show the bookmark bar all
the time", like normal users can do?  That seems very odd.

[Joao da Silva, 2011/08/05 09:24:11]

The "always show the bookmarks bar" preference just toggles where the bookmarks
bar is placed (as a toolbar, or in the NTP). I guess there wasn't any demand to
control that with a policy. This policy is meant to make the bar completely go
away, or just stay fixed in the NTP instead.

+  // This also disables the checkbox for this preference in the prefs UI.
+  prefs_.SetValue(prefs::kShowBookmarkBar, Value::CreateBooleanValue(false));
+  return true;
+}
+
 void ConfigurationPolicyPrefKeeper::EnsureStringPrefExists(
     const std::string& path) {
   std::string value;
   if (!prefs_.GetString(path, &value))
     prefs_.SetString(path, value);
 }
 
 namespace {
 
 // Implementation of SearchTermsData just for validation.
@@ skipping 569 matching lines @@
   // Update the initialization flag.
   if (!initialization_complete_ &&
       provider_->IsInitializationComplete()) {
     initialization_complete_ = true;
     FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
                       OnInitializationCompleted(true));
   }
 }
 
 }  // namespace policy