chrome/browser/ui/cocoa/location_bar/selected_keyword_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/selected_keyword_decoration.mm

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

Patch Set: " 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm ('K') | « chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h ('k') | chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm » ('j') | chrome/browser/ui/cocoa/location_bar/separator_decoration.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2c6cda6cc317b701e6c98cb468a404c28156ef62..90b24879ce2631bf1a27fc09f4f13c3f0810c1a1 100644

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

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

@@ -27,7 +27,8 @@ SelectedKeywordDecoration::SelectedKeywordDecoration(NSFont* font)

SelectedKeywordDecoration::~SelectedKeywordDecoration() {}

-CGFloat SelectedKeywordDecoration::GetWidthForSpace(CGFloat width) {

+CGFloat SelectedKeywordDecoration::GetWidthForSpace(CGFloat width,

+ CGFloat text_width) {

const CGFloat full_width =

GetWidthForImageAndLabel(search_image_, full_string_);

if (full_width <= width) {