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.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: s/settings/wrench/g 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

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..24744d38efb789e6d66f685314c569ecaa2f66d3 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_->IsWrenchMenuShowing());

}

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') | no next file with comments »