chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm - Issue 2013183003: [Mac][Material Design] Bring Omnibox stroke and MD colors up to spec.

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 2013183003: [Mac][Material Design] Bring Omnibox stroke and MD colors up to spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compile error. Created 4 years, 7 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/location_bar/location_bar_view_mac.mm ('k') | chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm » ('j') | no next file with comments »
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 2e34a4d5517a027113f95271410ea9847d011805..b6bf09f0121b2d7784fdc51b08968a22c92adb18 100644

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

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

@@ -35,7 +35,10 @@ SelectedKeywordDecoration::SelectedKeywordDecoration() {

SelectedKeywordDecoration::~SelectedKeywordDecoration() {}

NSColor* SelectedKeywordDecoration::GetBackgroundBorderColor() {

- return skia::SkColorToCalibratedNSColor(gfx::kGoogleBlue700);

+ if (!ui::MaterialDesignController::IsModeMaterial()) {

+ return skia::SkColorToCalibratedNSColor(gfx::kGoogleBlue700);

+ }

+ return skia::SkColorToSRGBNSColor(gfx::kGoogleBlue700);

}

CGFloat SelectedKeywordDecoration::GetWidthForSpace(CGFloat width) {