Fixed behavior of the bookmark bar visibility.

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 <string>
 #include <vector>
 
@@ skipping 88 matching lines @@
   // 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 incognito mode availability related policies. Returns true if the
   // specified policy is pertinent to incognito mode availability. In that case,
   // the function takes ownership of |value|.
   bool ApplyIncognitoModePolicy(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 161 matching lines @@
     prefs::kRemoteAccessClientFirewallTraversal },
   { Value::TYPE_BOOLEAN, kPolicyRemoteAccessHostFirewallTraversal,
     prefs::kRemoteAccessHostFirewallTraversal },
   { Value::TYPE_BOOLEAN, kPolicyCloudPrintProxyEnabled,
     prefs::kCloudPrintProxyEnabled },
   { Value::TYPE_BOOLEAN, kPolicyTranslateEnabled, prefs::kEnableTranslate },
   { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins,
     prefs::kPluginsAllowOutdated },
   { Value::TYPE_BOOLEAN, kPolicyAlwaysAuthorizePlugins,
     prefs::kPluginsAlwaysAuthorize },
+  { Value::TYPE_BOOLEAN, kPolicyBookmarkBarEnabled,
+    prefs::kShowBookmarkBar },
   { Value::TYPE_BOOLEAN, kPolicyEditBookmarksEnabled,
     prefs::kEditBookmarksEnabled },
   { Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs,
     prefs::kAllowFileSelectionDialogs },
   { Value::TYPE_BOOLEAN, kPolicyImportBookmarks,
     prefs::kImportBookmarks},
   { Value::TYPE_BOOLEAN, kPolicyImportHistory,
     prefs::kImportHistory},
   { Value::TYPE_BOOLEAN, kPolicyImportHomepage,
     prefs::kImportHomepage},
@@ skipping 84 matching lines @@
     // policy settings.
     Value* value = current->second->DeepCopy();
     if (ApplyProxyPolicy(current->first, value) ||
         ApplySyncPolicy(current->first, value) ||
         ApplyAutofillPolicy(current->first, value) ||
         ApplyDownloadDirPolicy(current->first, value) ||
         ApplyDiskCacheDirPolicy(current->first, value) ||
         ApplyFileSelectionDialogsPolicy(current->first, value) ||
         ApplyDefaultSearchPolicy(current->first, value) ||
         ApplyIncognitoModePolicy(current->first, value) ||
-        ApplyBookmarksPolicy(current->first, value) ||
         ApplyPolicyFromMap(current->first, value,
                            kSimplePolicyMap, arraysize(kSimplePolicyMap))) {
       continue;
     }
     delete value;
 
     // Other policy implementations should go into the conditional above.
     NOTIMPLEMENTED();
   }
 }
@@ skipping 205 matching lines @@
     return true;
   }
   if (policy == kPolicyIncognitoEnabled) {
     deprecated_incognito_enabled_.reset(value);
     return true;
   }
   // The policy is not relevant to incognito.
   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.
-  // 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 611 matching lines @@
   // Update the initialization flag.
   if (!initialization_complete_ &&
       provider_->IsInitializationComplete()) {
     initialization_complete_ = true;
     FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
                       OnInitializationCompleted(true));
   }
 }
 
 }  // namespace policy