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

Side by Side Diff: ui/native_theme/common_theme.cc

Issue 2375543003: Add SetProminent() to MdTextButton to create blue buttons. (Closed)
Patch Set: Fix nits. Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « ui/app_list/views/search_result_actions_view.cc ('k') | ui/native_theme/native_theme.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/native_theme/common_theme.h" 5 #include "ui/native_theme/common_theme.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "third_party/skia/include/core/SkCanvas.h" 9 #include "third_party/skia/include/core/SkCanvas.h"
10 #include "ui/base/material_design/material_design_controller.h" 10 #include "ui/base/material_design/material_design_controller.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 static const SkColor kButtonEnabledColor = SkColorSetRGB(0x22, 0x22, 0x22); 152 static const SkColor kButtonEnabledColor = SkColorSetRGB(0x22, 0x22, 0x22);
153 static const SkColor kButtonHighlightColor = SkColorSetRGB(0, 0, 0); 153 static const SkColor kButtonHighlightColor = SkColorSetRGB(0, 0, 0);
154 static const SkColor kButtonHoverColor = kButtonEnabledColor; 154 static const SkColor kButtonHoverColor = kButtonEnabledColor;
155 static const SkColor kButtonHoverBackgroundColor = 155 static const SkColor kButtonHoverBackgroundColor =
156 SkColorSetRGB(0xEA, 0xEA, 0xEA); 156 SkColorSetRGB(0xEA, 0xEA, 0xEA);
157 static const SkColor kBlueButtonEnabledColor = SK_ColorWHITE; 157 static const SkColor kBlueButtonEnabledColor = SK_ColorWHITE;
158 static const SkColor kBlueButtonDisabledColor = SK_ColorWHITE; 158 static const SkColor kBlueButtonDisabledColor = SK_ColorWHITE;
159 static const SkColor kBlueButtonPressedColor = SK_ColorWHITE; 159 static const SkColor kBlueButtonPressedColor = SK_ColorWHITE;
160 static const SkColor kBlueButtonHoverColor = SK_ColorWHITE; 160 static const SkColor kBlueButtonHoverColor = SK_ColorWHITE;
161 static const SkColor kBlueButtonShadowColor = SkColorSetRGB(0x53, 0x8C, 0xEA); 161 static const SkColor kBlueButtonShadowColor = SkColorSetRGB(0x53, 0x8C, 0xEA);
162 static const SkColor kCallToActionColor = gfx::kGoogleBlue500; 162 static const SkColor kProminentButtonColor = gfx::kGoogleBlue500;
163 static const SkColor kTextOnCallToActionColor = SK_ColorWHITE; 163 static const SkColor kProminentButtonTextColor = SK_ColorWHITE;
164 static const SkColor kButtonPressedShade = SK_ColorTRANSPARENT; 164 static const SkColor kButtonPressedShade = SK_ColorTRANSPARENT;
165 // MenuItem: 165 // MenuItem:
166 static const SkColor kMenuBackgroundColor = SK_ColorWHITE; 166 static const SkColor kMenuBackgroundColor = SK_ColorWHITE;
167 static const SkColor kMenuHighlightBackgroundColor = 167 static const SkColor kMenuHighlightBackgroundColor =
168 SkColorSetRGB(0x42, 0x81, 0xF4); 168 SkColorSetRGB(0x42, 0x81, 0xF4);
169 static const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA); 169 static const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA);
170 static const SkColor kEnabledMenuButtonBorderColor = 170 static const SkColor kEnabledMenuButtonBorderColor =
171 SkColorSetARGB(0x24, 0x00, 0x00, 0x00); 171 SkColorSetARGB(0x24, 0x00, 0x00, 0x00);
172 static const SkColor kFocusedMenuButtonBorderColor = 172 static const SkColor kFocusedMenuButtonBorderColor =
173 SkColorSetARGB(0x48, 0x00, 0x00, 0x00); 173 SkColorSetARGB(0x48, 0x00, 0x00, 0x00);
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 case NativeTheme::kColorId_BlueButtonEnabledColor: 287 case NativeTheme::kColorId_BlueButtonEnabledColor:
288 return kBlueButtonEnabledColor; 288 return kBlueButtonEnabledColor;
289 case NativeTheme::kColorId_BlueButtonDisabledColor: 289 case NativeTheme::kColorId_BlueButtonDisabledColor:
290 return kBlueButtonDisabledColor; 290 return kBlueButtonDisabledColor;
291 case NativeTheme::kColorId_BlueButtonPressedColor: 291 case NativeTheme::kColorId_BlueButtonPressedColor:
292 return kBlueButtonPressedColor; 292 return kBlueButtonPressedColor;
293 case NativeTheme::kColorId_BlueButtonHoverColor: 293 case NativeTheme::kColorId_BlueButtonHoverColor:
294 return kBlueButtonHoverColor; 294 return kBlueButtonHoverColor;
295 case NativeTheme::kColorId_BlueButtonShadowColor: 295 case NativeTheme::kColorId_BlueButtonShadowColor:
296 return kBlueButtonShadowColor; 296 return kBlueButtonShadowColor;
297 case NativeTheme::kColorId_CallToActionColor: 297 case NativeTheme::kColorId_ProminentButtonColor:
298 return kCallToActionColor; 298 return kProminentButtonColor;
299 case NativeTheme::kColorId_TextOnCallToActionColor: 299 case NativeTheme::kColorId_TextOnProminentButtonColor:
300 return kTextOnCallToActionColor; 300 return kProminentButtonTextColor;
301 case NativeTheme::kColorId_ButtonPressedShade: 301 case NativeTheme::kColorId_ButtonPressedShade:
302 return kButtonPressedShade; 302 return kButtonPressedShade;
303 303
304 // MenuItem 304 // MenuItem
305 case NativeTheme::kColorId_MenuBorderColor: 305 case NativeTheme::kColorId_MenuBorderColor:
306 return kMenuBorderColor; 306 return kMenuBorderColor;
307 case NativeTheme::kColorId_EnabledMenuButtonBorderColor: 307 case NativeTheme::kColorId_EnabledMenuButtonBorderColor:
308 return kEnabledMenuButtonBorderColor; 308 return kEnabledMenuButtonBorderColor;
309 case NativeTheme::kColorId_FocusedMenuButtonBorderColor: 309 case NativeTheme::kColorId_FocusedMenuButtonBorderColor:
310 return kFocusedMenuButtonBorderColor; 310 return kFocusedMenuButtonBorderColor;
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 } 478 }
479 if (menu_item.corner_radius > 0) { 479 if (menu_item.corner_radius > 0) {
480 const SkScalar radius = SkIntToScalar(menu_item.corner_radius); 480 const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
481 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint); 481 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint);
482 return; 482 return;
483 } 483 }
484 canvas->drawRect(gfx::RectToSkRect(rect), paint); 484 canvas->drawRect(gfx::RectToSkRect(rect), paint);
485 } 485 }
486 486
487 } // namespace ui 487 } // namespace ui
OLDNEW
« no previous file with comments | « ui/app_list/views/search_result_actions_view.cc ('k') | ui/native_theme/native_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698