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

chrome/browser/ui/gtk/browser_window_gtk.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/ui/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <dlfcn.h>
 #include <string>
@@ skipping 894 matching lines @@
 
 void BrowserWindowGtk::FocusChromeOSStatus() {
   NOTIMPLEMENTED();
 }
 
 void BrowserWindowGtk::RotatePaneFocus(bool forwards) {
   NOTIMPLEMENTED();
 }
 
 bool BrowserWindowGtk::IsBookmarkBarVisible() const {
-  return (browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR) &&
-          bookmark_bar_.get() &&
-          browser_->profile()->GetPrefs()->GetBoolean(
-              prefs::kShowBookmarkBar) &&
-          browser_->profile()->GetPrefs()->GetBoolean(
-              prefs::kEnableBookmarkBar));
+  return browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR) &&
+         bookmark_bar_.get() &&
+         browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
 }
 
 bool BrowserWindowGtk::IsBookmarkBarAnimating() const {
   if (IsBookmarkBarSupported() && bookmark_bar_->IsAnimating())
     return true;
   return false;
 }
 
 bool BrowserWindowGtk::IsTabStripEditable() const {
   return !tabstrip()->IsDragSessionActive() &&
@@ skipping 1443 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "Compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }