Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1608)

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 7564011: Prevent accelerators from toggling the bookmark bar when disabled by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reviewed, rebased Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index e568191b9100abf9a1157facd2228f2c174a667b..6320fcb969e988cef532043a63623c6d6382ea70 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -912,12 +912,9 @@ void BrowserWindowGtk::RotatePaneFocus(bool forwards) {
}
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 {
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698