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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.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/omnibox/omnibox_popup_cell.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_view.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
index 8e0ac1494efb3cedaf9ea95f6e4dd36236d5c298..ddd172306721b1f8825d4921e1d3672058e48445 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -102,19 +102,22 @@ NSColor* SecureSchemeColor(bool in_dark_mode) {
if (!ui::MaterialDesignController::IsModeMaterial()) {
return ColorWithRGBBytes(0x07, 0x95, 0x00);
}
- return in_dark_mode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5]
- : skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700);
+ return in_dark_mode
+ ? skia::SkColorToSRGBNSColor(SkColorSetA(SK_ColorWHITE, 0x7F))
+ : skia::SkColorToSRGBNSColor(gfx::kGoogleGreen700);
}
NSColor* SecurityWarningSchemeColor(bool in_dark_mode) {
- return in_dark_mode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5]
- : skia::SkColorToCalibratedNSColor(gfx::kGoogleYellow700);
+ return in_dark_mode
+ ? skia::SkColorToSRGBNSColor(SkColorSetA(SK_ColorWHITE, 0x7F))
+ : skia::SkColorToSRGBNSColor(gfx::kGoogleYellow700);
}
NSColor* SecurityErrorSchemeColor(bool in_dark_mode) {
if (!ui::MaterialDesignController::IsModeMaterial()) {
return ColorWithRGBBytes(0xa2, 0x00, 0x00);
}
- return in_dark_mode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5]
- : skia::SkColorToCalibratedNSColor(gfx::kGoogleRed700);
+ return in_dark_mode
+ ? skia::SkColorToSRGBNSColor(SkColorSetA(SK_ColorWHITE, 0x7F))
+ : skia::SkColorToSRGBNSColor(gfx::kGoogleRed700);
}
const char kOmniboxViewMacStateKey[] = "OmniboxViewMacState";
@@ -176,7 +179,7 @@ NSColor* OmniboxViewMac::BaseTextColor(bool in_dark_mode) {
if (!ui::MaterialDesignController::IsModeMaterial()) {
return [NSColor darkGrayColor];
}
- return skia::SkColorToCalibratedNSColor(BaseTextColorSkia(in_dark_mode));
+ return skia::SkColorToSRGBNSColor(BaseTextColorSkia(in_dark_mode));
}
// static
« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698