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

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

Issue 12483006: wrench_menu: use NativeTheme colors under aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: {background,border}_color fixup and HoverBorderColor Created 7 years, 9 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
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/native_theme_aura.h" 5 #include "ui/native_theme/native_theme_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "grit/ui_resources.h" 8 #include "grit/ui_resources.h"
9 #include "ui/base/layout.h" 9 #include "ui/base/layout.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 10 matching lines...) Expand all
21 21
22 // Theme colors returned by GetSystemColor(). 22 // Theme colors returned by GetSystemColor().
23 const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128); 23 const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
24 // Windows: 24 // Windows:
25 const SkColor kWindowBackgroundColor = SK_ColorWHITE; 25 const SkColor kWindowBackgroundColor = SK_ColorWHITE;
26 // Dialogs: 26 // Dialogs:
27 const SkColor kDialogBackgroundColor = SkColorSetRGB(251, 251, 251); 27 const SkColor kDialogBackgroundColor = SkColorSetRGB(251, 251, 251);
28 // FocusableBorder: 28 // FocusableBorder:
29 const SkColor kFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE); 29 const SkColor kFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE);
30 const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9); 30 const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9);
31 const SkColor kHoverBorderColor = SkColorSetARGB(72, 0, 0, 0);
31 // TextButton: 32 // TextButton:
32 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xDE, 0xDE, 0xDE); 33 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xDE, 0xDE, 0xDE);
33 const SkColor kTextButtonEnabledColor = SkColorSetRGB(0x22, 0x22, 0x22); 34 const SkColor kTextButtonEnabledColor = SkColorSetRGB(0x22, 0x22, 0x22);
34 const SkColor kTextButtonDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99); 35 const SkColor kTextButtonDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99);
35 const SkColor kTextButtonHighlightColor = SkColorSetRGB(0, 0, 0); 36 const SkColor kTextButtonHighlightColor = SkColorSetRGB(0, 0, 0);
36 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor; 37 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor;
37 // MenuItem: 38 // MenuItem:
38 const SkColor kEnabledMenuItemForegroundColor = kTextButtonEnabledColor; 39 const SkColor kEnabledMenuItemForegroundColor = kTextButtonEnabledColor;
39 const SkColor kDisabledMenuItemForegroundColor = kTextButtonDisabledColor; 40 const SkColor kDisabledMenuItemForegroundColor = kTextButtonDisabledColor;
40 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(0xF1, 0xF1, 0xF1); 41 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(0xF1, 0xF1, 0xF1);
42 const SkColor kHoverMenuItemBackgroundColor = SkColorSetRGB(204, 204, 204);
41 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xED, 0xED, 0xED); 43 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xED, 0xED, 0xED);
42 // Label: 44 // Label:
43 const SkColor kLabelEnabledColor = kTextButtonEnabledColor; 45 const SkColor kLabelEnabledColor = kTextButtonEnabledColor;
44 const SkColor kLabelDisabledColor = kTextButtonDisabledColor; 46 const SkColor kLabelDisabledColor = kTextButtonDisabledColor;
45 const SkColor kLabelBackgroundColor = SK_ColorWHITE; 47 const SkColor kLabelBackgroundColor = SK_ColorWHITE;
46 // Textfield: 48 // Textfield:
47 const SkColor kTextfieldDefaultColor = SK_ColorBLACK; 49 const SkColor kTextfieldDefaultColor = SK_ColorBLACK;
48 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE; 50 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;
49 const SkColor kTextfieldReadOnlyColor = SK_ColorDKGRAY; 51 const SkColor kTextfieldReadOnlyColor = SK_ColorDKGRAY;
50 const SkColor kTextfieldReadOnlyBackground = SK_ColorWHITE; 52 const SkColor kTextfieldReadOnlyBackground = SK_ColorWHITE;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 105
104 // Dialogs 106 // Dialogs
105 case kColorId_DialogBackground: 107 case kColorId_DialogBackground:
106 return kDialogBackgroundColor; 108 return kDialogBackgroundColor;
107 109
108 // FocusableBorder 110 // FocusableBorder
109 case kColorId_FocusedBorderColor: 111 case kColorId_FocusedBorderColor:
110 return kFocusedBorderColor; 112 return kFocusedBorderColor;
111 case kColorId_UnfocusedBorderColor: 113 case kColorId_UnfocusedBorderColor:
112 return kUnfocusedBorderColor; 114 return kUnfocusedBorderColor;
115 case kColorId_HoverBorderColor:
116 return kHoverBorderColor;
113 117
114 // TextButton 118 // TextButton
115 case kColorId_TextButtonBackgroundColor: 119 case kColorId_TextButtonBackgroundColor:
116 return kTextButtonBackgroundColor; 120 return kTextButtonBackgroundColor;
117 case kColorId_TextButtonEnabledColor: 121 case kColorId_TextButtonEnabledColor:
118 return kTextButtonEnabledColor; 122 return kTextButtonEnabledColor;
119 case kColorId_TextButtonDisabledColor: 123 case kColorId_TextButtonDisabledColor:
120 return kTextButtonDisabledColor; 124 return kTextButtonDisabledColor;
121 case kColorId_TextButtonHighlightColor: 125 case kColorId_TextButtonHighlightColor:
122 return kTextButtonHighlightColor; 126 return kTextButtonHighlightColor;
123 case kColorId_TextButtonHoverColor: 127 case kColorId_TextButtonHoverColor:
124 return kTextButtonHoverColor; 128 return kTextButtonHoverColor;
125 129
126 // MenuItem 130 // MenuItem
127 case kColorId_EnabledMenuItemForegroundColor: 131 case kColorId_EnabledMenuItemForegroundColor:
128 return kEnabledMenuItemForegroundColor; 132 return kEnabledMenuItemForegroundColor;
129 case kColorId_DisabledMenuItemForegroundColor: 133 case kColorId_DisabledMenuItemForegroundColor:
130 return kDisabledMenuItemForegroundColor; 134 return kDisabledMenuItemForegroundColor;
131 case kColorId_FocusedMenuItemBackgroundColor: 135 case kColorId_FocusedMenuItemBackgroundColor:
132 return kFocusedMenuItemBackgroundColor; 136 return kFocusedMenuItemBackgroundColor;
137 case kColorId_HoverMenuItemBackgroundColor:
138 return kHoverMenuItemBackgroundColor;
133 case kColorId_MenuSeparatorColor: 139 case kColorId_MenuSeparatorColor:
134 return kMenuSeparatorColor; 140 return kMenuSeparatorColor;
135 141
136 // Label 142 // Label
137 case kColorId_LabelEnabledColor: 143 case kColorId_LabelEnabledColor:
138 return kLabelEnabledColor; 144 return kLabelEnabledColor;
139 case kColorId_LabelDisabledColor: 145 case kColorId_LabelDisabledColor:
140 return kLabelDisabledColor; 146 return kLabelDisabledColor;
141 case kColorId_LabelBackgroundColor: 147 case kColorId_LabelBackgroundColor:
142 return kLabelBackgroundColor; 148 return kLabelBackgroundColor;
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 DrawTiledImage(canvas, *center, 370 DrawTiledImage(canvas, *center,
365 0, 0, 1.0, 1.0, 371 0, 0, 1.0, 1.0,
366 rect.x() + left->width(), rect.y(), 372 rect.x() + left->width(), rect.y(),
367 rect.width() - left->width() - right->width(), 373 rect.width() - left->width() - right->width(),
368 center->height()); 374 center->height());
369 } 375 }
370 } 376 }
371 } 377 }
372 378
373 } // namespace ui 379 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698