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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10878013: Don't show the zoom bubble when the settings menu is showing on views or GTK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: khorimoto@ review Created 8 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/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | chrome/browser/ui/views/toolbar_view.h » ('J')
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 136d343f8031855a0f7676b3d88a1e93bf995006..56bfd575415b5beffa5cf569ca17f611874a8203 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -840,7 +840,8 @@ void BrowserWindowGtk::SetStarredState(bool is_starred) {
}
void BrowserWindowGtk::ZoomChangedForActiveTab(bool can_show_bubble) {
- toolbar_->GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble);
+ toolbar_->GetLocationBarView()->ZoomChangedForActiveTab(
+ can_show_bubble && !toolbar_->IsSettingsMenuShowing());
}
gfx::Rect BrowserWindowGtk::GetRestoredBounds() const {
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | chrome/browser/ui/views/toolbar_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698