chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 10828364: Don't show the button for hidden page/browser actions or script badges.

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/cocoa/location_bar/location_bar_view_mac.mm

Issue 10828364: Don't show the button for hidden page/browser actions or script badges. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: 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/cocoa/extensions/browser_actions_controller.mm ('k') | chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

===================================================================

--- chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (revision 152078)

+++ chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (working copy)

@@ -410,7 +410,6 @@

AutocompleteTextFieldCell* cell = [field_ cell];

NSRect frame = [cell frameForDecoration:decoration inFrame:[field_ bounds]];

- DCHECK(!NSIsEmptyRect(frame));

return frame;

}

@@ -421,8 +420,13 @@

return NSZeroPoint;

NSRect frame = GetPageActionFrame(page_action);

- if (NSIsEmptyRect(frame))

+ if (NSIsEmptyRect(frame)) {

+ // The bubble point positioning assumes that the page action is visible. If

+ // not, something else needs to be done otherwise the bubble will appear

+ // near the top left corner (unanchored).

+ NOTREACHED();

return NSZeroPoint;

+ }

NSPoint bubble_point = decoration->GetBubblePointInFrame(frame);

return [field_ convertPoint:bubble_point toView:nil];