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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

Issue 1909453004: [Mac][Material Design] Adjust EV chip to match Material Design spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix problems. Created 4 years, 8 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
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 621ee6e2275182c6d0281f69b4cb90629d4a8b6c..b9217a9c1f13546b2373bba6c88a0052f9147903 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -159,13 +159,21 @@ NSColor* OmniboxViewMac::SuggestTextColor() {
return [NSColor colorWithCalibratedWhite:0.0 alpha:0.5];
}
+//static
+SkColor OmniboxViewMac::SkBaseTextColor(bool in_dark_mode) {
+ // The returned colors should match BaseTextColor.
+ const SkColor kFiftyPercentWhite = 0x7FFFFFFF;
+ const SkColor kFiftyPercentBlack = 0x7F000000;
+ return in_dark_mode ? kFiftyPercentWhite
tapted 2016/04/27 02:37:39 what you have is fine, an alternative if you like
shrike 2016/04/27 16:35:17 I like your suggestion better (with 0x7F instead o
+ : kFiftyPercentBlack;
+}
+
// static
-NSColor* OmniboxViewMac::BaseTextColor(bool inDarkMode) {
+NSColor* OmniboxViewMac::BaseTextColor(bool in_dark_mode) {
if (!ui::MaterialDesignController::IsModeMaterial()) {
return [NSColor darkGrayColor];
}
- return inDarkMode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5]
- : [NSColor colorWithCalibratedWhite:0 alpha:0.5];
+ return skia::SkColorToCalibratedNSColor(SkBaseTextColor(in_dark_mode));
}
OmniboxViewMac::OmniboxViewMac(OmniboxEditController* controller,

Powered by Google App Engine
This is Rietveld 408576698