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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/frame/browser_view.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: remove TODO 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/location_bar_view_gtk.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.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/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 02644c936ba1324c07a92e30c7925a7556b09b86..b9d53040a2b14ea0e3c4ccff7d0aea9ed1864dfe 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -687,7 +687,8 @@ void BrowserView::SetStarredState(bool is_starred) {
}
void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) {
- GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble);
+ GetLocationBarView()->ZoomChangedForActiveTab(
+ can_show_bubble && !toolbar_->IsSettingsMenuShowing());
}
gfx::Rect BrowserView::GetRestoredBounds() const {
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | chrome/browser/ui/views/toolbar_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698