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

Unified Diff: ui/native_theme/common_theme.cc

Issue 1525163004: First stab at MD text buttons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years 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/views/infobars/infobar_view.cc ('k') | ui/native_theme/native_theme.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/native_theme/common_theme.cc
diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
index f3bf871cb7fec3b87807d4e15b0c439f042ace31..9283eba9845634cf9cb2b165c1b84f2a53668b6f 100644
--- a/ui/native_theme/common_theme.cc
+++ b/ui/native_theme/common_theme.cc
@@ -29,13 +29,18 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
if (ui::MaterialDesignController::IsModeMaterial()) {
// Dialogs:
static const SkColor kDialogBackgroundColorMd = SK_ColorWHITE;
+ // Button:
+ static const SkColor kTextButtonEnabledColorMd =
+ SkColorSetRGB(0x64, 0x64, 0x64);
+ static const SkColor kTextButtonDisabledColorMd =
+ SkColorSetA(kTextButtonEnabledColorMd, 0x80);
// MenuItem:
- const SkColor kMenuHighlightBackgroundColorMd =
+ static const SkColor kMenuHighlightBackgroundColorMd =
SkColorSetARGB(0x14, 0x00, 0x00, 0x00);
- const SkColor kSelectedMenuItemForegroundColorMd = SK_ColorBLACK;
+ static const SkColor kSelectedMenuItemForegroundColorMd = SK_ColorBLACK;
// Link:
- const SkColor kLinkDisabledColorMd = SK_ColorBLACK;
- const SkColor kLinkEnabledColorMd = gfx::kGoogleBlue700;
+ static const SkColor kLinkDisabledColorMd = SK_ColorBLACK;
+ static const SkColor kLinkEnabledColorMd = gfx::kGoogleBlue700;
// Results tables:
static const SkColor kResultsTableTextMd = SK_ColorBLACK;
static const SkColor kResultsTableDimmedTextMd =
@@ -49,6 +54,12 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
case NativeTheme::kColorId_BubbleBackground:
return kDialogBackgroundColorMd;
+ // Button
+ case NativeTheme::kColorId_MdTextButtonEnabledColor:
+ return kTextButtonEnabledColorMd;
+ case NativeTheme::kColorId_MdTextButtonDisabledColor:
+ return kTextButtonDisabledColorMd;
+
// MenuItem
case NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
return kMenuHighlightBackgroundColorMd;
@@ -394,6 +405,8 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
case NativeTheme::kColorId_ThrobberLightColor:
return kThrobberLightColor;
+ case NativeTheme::kColorId_MdTextButtonEnabledColor:
+ case NativeTheme::kColorId_MdTextButtonDisabledColor:
case NativeTheme::kColorId_NumColors:
break;
}
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar_view.cc ('k') | ui/native_theme/native_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698