Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(391)

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 2075293002: Updated the EV cert update, Keyword search, and Popup blocking decorations with the new specs (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/location_bar_decoration.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 99219acc781579215a6df88b12b492fa55b91b17..e035c0a383ad7995135c04aa21c7ecc16ff610f8 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
@@ -820,14 +820,16 @@ NSImage* LocationBarViewMac::GetKeywordImage(const base::string16& keyword) {
GetOmniboxIcon(template_url->GetExtensionId()).AsNSImage();
}
- return ui::MaterialDesignController::IsModeMaterial()
- ? NSImageFromImageSkiaWithColorSpace(
- gfx::CreateVectorIcon(
- gfx::VectorIconId::OMNIBOX_SEARCH,
- kDefaultIconSize,
- gfx::kGoogleBlue700),
- base::mac::GetSRGBColorSpace())
- : OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
+ if (ui::MaterialDesignController::IsModeMaterial()) {
+ SkColor icon_color = IsLocationBarDark() ? kMaterialDarkVectorIconColor
+ : gfx::kGoogleBlue700;
+ return NSImageFromImageSkiaWithColorSpace(
+ gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_SEARCH,
+ kDefaultIconSize, icon_color),
+ base::mac::GetSRGBColorSpace());
+ }
+
+ return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
}
void LocationBarViewMac::PostNotification(NSString* notification) {
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698