chrome/browser/ui/cocoa/location_bar/image_decoration.mm - Issue 12042002: Alternate NTP: Add search token to omnibox

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/image_decoration.mm

Issue 12042002: Alternate NTP: Add search token to omnibox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address review comments Created 7 years, 11 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:

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

diff --git a/chrome/browser/ui/cocoa/location_bar/image_decoration.mm b/chrome/browser/ui/cocoa/location_bar/image_decoration.mm

index a5be9c5c380bc63ccc2e2daf4e359f10746013ab..c9e4af0227b7941a4fc8d8c9053fc00518a9f00e 100644

--- a/chrome/browser/ui/cocoa/location_bar/image_decoration.mm

+++ b/chrome/browser/ui/cocoa/location_bar/image_decoration.mm

@@ -33,7 +33,7 @@ NSRect ImageDecoration::GetDrawRectInFrame(NSRect frame) {

return NSInsetRect(frame, x_inset, y_inset);

}

-CGFloat ImageDecoration::GetWidthForSpace(CGFloat width) {

+CGFloat ImageDecoration::GetWidthForSpace(CGFloat width, CGFloat text_width) {

NSImage* image = GetImage();

if (image) {

const CGFloat image_width = [image size].width;