chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 2032143004: [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/location_bar_view_mac.mm

Issue 2032143004: [Mac][Material Design] Bring Omnibox stroke and MD colors up to spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743

Patch Set: Created 4 years, 6 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/bubble_decoration.mm ('k') | chrome/browser/ui/cocoa/location_bar/selected_keyword_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

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

index c8aedec6ccff2c94107ab6326820efd5292eb0b6..8d0b30ff0e73b8bc272a6f9d66c6e450040db361 100644

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

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

@@ -574,7 +574,17 @@ void LocationBarViewMac::UpdateLocationIcon() {

if (in_dark_mode) {

vector_icon_color = SK_ColorWHITE;

} else {

- vector_icon_color = OmniboxViewMac::BaseTextColorSkia(in_dark_mode);

+ security_state::SecurityStateModel::SecurityLevel security_level =

+ GetToolbarModel()->GetSecurityLevel(false);

+ if (security_level == security_state::SecurityStateModel::NONE) {

+ vector_icon_color = OmniboxViewMac::BaseTextColorSkia(in_dark_mode);

+ } else {

+ NSColor* sRGBColor =

+ OmniboxViewMac::GetSecureTextColor(security_level, in_dark_mode);

+ NSColor* deviceColor =

+ [sRGBColor colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];

+ vector_icon_color = skia::NSDeviceColorToSkColor(deviceColor);

+ }

}