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

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: fix windows build 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
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | ui/native_theme/native_theme_gtk.cc » ('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/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 20 matching lines...) Expand all
31 // TextButton: 31 // TextButton:
32 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xDE, 0xDE, 0xDE); 32 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xDE, 0xDE, 0xDE);
33 const SkColor kTextButtonEnabledColor = SkColorSetRGB(0x22, 0x22, 0x22); 33 const SkColor kTextButtonEnabledColor = SkColorSetRGB(0x22, 0x22, 0x22);
34 const SkColor kTextButtonDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99); 34 const SkColor kTextButtonDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99);
35 const SkColor kTextButtonHighlightColor = SkColorSetRGB(0, 0, 0); 35 const SkColor kTextButtonHighlightColor = SkColorSetRGB(0, 0, 0);
36 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor; 36 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor;
37 // MenuItem: 37 // MenuItem:
38 const SkColor kEnabledMenuItemForegroundColor = kTextButtonEnabledColor; 38 const SkColor kEnabledMenuItemForegroundColor = kTextButtonEnabledColor;
39 const SkColor kDisabledMenuItemForegroundColor = kTextButtonDisabledColor; 39 const SkColor kDisabledMenuItemForegroundColor = kTextButtonDisabledColor;
40 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(0xF1, 0xF1, 0xF1); 40 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(0xF1, 0xF1, 0xF1);
41 const SkColor kHoverMenuItemBackgroundColor =
42 SkColorSetARGB(204, 255, 255, 255);
41 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xED, 0xED, 0xED); 43 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xED, 0xED, 0xED);
44 const SkColor kEnabledMenuButtonBorderColor = SkColorSetARGB(36, 0, 0, 0);
45 const SkColor kFocusedMenuButtonBorderColor = SkColorSetARGB(72, 0, 0, 0);
46 const SkColor kHoverMenuButtonBorderColor = SkColorSetARGB(72, 0, 0, 0);
42 // Label: 47 // Label:
43 const SkColor kLabelEnabledColor = kTextButtonEnabledColor; 48 const SkColor kLabelEnabledColor = kTextButtonEnabledColor;
44 const SkColor kLabelDisabledColor = kTextButtonDisabledColor; 49 const SkColor kLabelDisabledColor = kTextButtonDisabledColor;
45 const SkColor kLabelBackgroundColor = SK_ColorWHITE; 50 const SkColor kLabelBackgroundColor = SK_ColorWHITE;
46 // Textfield: 51 // Textfield:
47 const SkColor kTextfieldDefaultColor = SK_ColorBLACK; 52 const SkColor kTextfieldDefaultColor = SK_ColorBLACK;
48 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE; 53 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;
49 const SkColor kTextfieldReadOnlyColor = SK_ColorDKGRAY; 54 const SkColor kTextfieldReadOnlyColor = SK_ColorDKGRAY;
50 const SkColor kTextfieldReadOnlyBackground = SK_ColorWHITE; 55 const SkColor kTextfieldReadOnlyBackground = SK_ColorWHITE;
51 const SkColor kTextfieldSelectionBackgroundFocused = 56 const SkColor kTextfieldSelectionBackgroundFocused =
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 case kColorId_TextButtonHoverColor: 128 case kColorId_TextButtonHoverColor:
124 return kTextButtonHoverColor; 129 return kTextButtonHoverColor;
125 130
126 // MenuItem 131 // MenuItem
127 case kColorId_EnabledMenuItemForegroundColor: 132 case kColorId_EnabledMenuItemForegroundColor:
128 return kEnabledMenuItemForegroundColor; 133 return kEnabledMenuItemForegroundColor;
129 case kColorId_DisabledMenuItemForegroundColor: 134 case kColorId_DisabledMenuItemForegroundColor:
130 return kDisabledMenuItemForegroundColor; 135 return kDisabledMenuItemForegroundColor;
131 case kColorId_FocusedMenuItemBackgroundColor: 136 case kColorId_FocusedMenuItemBackgroundColor:
132 return kFocusedMenuItemBackgroundColor; 137 return kFocusedMenuItemBackgroundColor;
138 case kColorId_HoverMenuItemBackgroundColor:
139 return kHoverMenuItemBackgroundColor;
133 case kColorId_MenuSeparatorColor: 140 case kColorId_MenuSeparatorColor:
134 return kMenuSeparatorColor; 141 return kMenuSeparatorColor;
142 case kColorId_EnabledMenuButtonBorderColor:
143 return kEnabledMenuButtonBorderColor;
144 case kColorId_FocusedMenuButtonBorderColor:
145 return kFocusedMenuButtonBorderColor;
146 case kColorId_HoverMenuButtonBorderColor:
147 return kHoverMenuButtonBorderColor;
135 148
136 // Label 149 // Label
137 case kColorId_LabelEnabledColor: 150 case kColorId_LabelEnabledColor:
138 return kLabelEnabledColor; 151 return kLabelEnabledColor;
139 case kColorId_LabelDisabledColor: 152 case kColorId_LabelDisabledColor:
140 return kLabelDisabledColor; 153 return kLabelDisabledColor;
141 case kColorId_LabelBackgroundColor: 154 case kColorId_LabelBackgroundColor:
142 return kLabelBackgroundColor; 155 return kLabelBackgroundColor;
143 156
144 // Textfield 157 // Textfield
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 case kColorId_TableSelectedText: 192 case kColorId_TableSelectedText:
180 case kColorId_TableSelectedTextUnfocused: 193 case kColorId_TableSelectedTextUnfocused:
181 return kTableSelectedTextColor; 194 return kTableSelectedTextColor;
182 case kColorId_TableSelectionBackgroundFocused: 195 case kColorId_TableSelectionBackgroundFocused:
183 case kColorId_TableSelectionBackgroundUnfocused: 196 case kColorId_TableSelectionBackgroundUnfocused:
184 return kTableSelectionBackgroundColor; 197 return kTableSelectionBackgroundColor;
185 case kColorId_TableGroupingIndicatorColor: 198 case kColorId_TableGroupingIndicatorColor:
186 return kTableGroupingIndicatorColor; 199 return kTableGroupingIndicatorColor;
187 200
188 case kColorId_MenuBackgroundColor: 201 case kColorId_MenuBackgroundColor:
202 return kMenuBackgroundColor;
189 case kColorId_MenuBorderColor: 203 case kColorId_MenuBorderColor:
190 NOTREACHED(); 204 NOTREACHED();
191 break; 205 break;
192 } 206 }
193 207
194 return kInvalidColorIdColor; 208 return kInvalidColorIdColor;
195 } 209 }
196 210
197 void NativeThemeAura::PaintMenuPopupBackground( 211 void NativeThemeAura::PaintMenuPopupBackground(
198 SkCanvas* canvas, 212 SkCanvas* canvas,
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 DrawTiledImage(canvas, *center, 378 DrawTiledImage(canvas, *center,
365 0, 0, 1.0, 1.0, 379 0, 0, 1.0, 1.0,
366 rect.x() + left->width(), rect.y(), 380 rect.x() + left->width(), rect.y(),
367 rect.width() - left->width() - right->width(), 381 rect.width() - left->width() - right->width(),
368 center->height()); 382 center->height());
369 } 383 }
370 } 384 }
371 } 385 }
372 386
373 } // namespace ui 387 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | ui/native_theme/native_theme_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698