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

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

Issue 12096094: Finalizing the 'OnClick' behavior of the Launcher items. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Corrected Windows Created 7 years, 10 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 | Annotate | Revision Log
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 21 matching lines...) Expand all
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 kMenuSeparatorColor = SkColorSetRGB(0xED, 0xED, 0xED); 41 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xED, 0xED, 0xED);
42 const SkColor kSelectedMenuItemBackgroundColor = SkColorSetRGB(203 , 219, 241);
43 const SkColor kFocusedSelectedMenuItemBackgroundColor =
44 SkColorSetRGB(193, 211, 236);
42 // Label: 45 // Label:
43 const SkColor kLabelEnabledColor = kTextButtonEnabledColor; 46 const SkColor kLabelEnabledColor = kTextButtonEnabledColor;
44 const SkColor kLabelDisabledColor = kTextButtonDisabledColor; 47 const SkColor kLabelDisabledColor = kTextButtonDisabledColor;
45 const SkColor kLabelBackgroundColor = SK_ColorWHITE; 48 const SkColor kLabelBackgroundColor = SK_ColorWHITE;
46 // Textfield: 49 // Textfield:
47 const SkColor kTextfieldDefaultColor = SK_ColorBLACK; 50 const SkColor kTextfieldDefaultColor = SK_ColorBLACK;
48 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE; 51 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;
49 const SkColor kTextfieldReadOnlyColor = SK_ColorDKGRAY; 52 const SkColor kTextfieldReadOnlyColor = SK_ColorDKGRAY;
50 const SkColor kTextfieldReadOnlyBackground = SK_ColorWHITE; 53 const SkColor kTextfieldReadOnlyBackground = SK_ColorWHITE;
51 const SkColor kTextfieldSelectionBackgroundFocused = 54 const SkColor kTextfieldSelectionBackgroundFocused =
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 128
126 // MenuItem 129 // MenuItem
127 case kColorId_EnabledMenuItemForegroundColor: 130 case kColorId_EnabledMenuItemForegroundColor:
128 return kEnabledMenuItemForegroundColor; 131 return kEnabledMenuItemForegroundColor;
129 case kColorId_DisabledMenuItemForegroundColor: 132 case kColorId_DisabledMenuItemForegroundColor:
130 return kDisabledMenuItemForegroundColor; 133 return kDisabledMenuItemForegroundColor;
131 case kColorId_FocusedMenuItemBackgroundColor: 134 case kColorId_FocusedMenuItemBackgroundColor:
132 return kFocusedMenuItemBackgroundColor; 135 return kFocusedMenuItemBackgroundColor;
133 case kColorId_MenuSeparatorColor: 136 case kColorId_MenuSeparatorColor:
134 return kMenuSeparatorColor; 137 return kMenuSeparatorColor;
138 case kColorId_SelectedMenuItemBackground:
139 return kSelectedMenuItemBackgroundColor;
140 case kColorId_FocusedSelectedMenuItemBackground:
141 return kFocusedSelectedMenuItemBackgroundColor;
135 142
136 // Label 143 // Label
137 case kColorId_LabelEnabledColor: 144 case kColorId_LabelEnabledColor:
138 return kLabelEnabledColor; 145 return kLabelEnabledColor;
139 case kColorId_LabelDisabledColor: 146 case kColorId_LabelDisabledColor:
140 return kLabelDisabledColor; 147 return kLabelDisabledColor;
141 case kColorId_LabelBackgroundColor: 148 case kColorId_LabelBackgroundColor:
142 return kLabelBackgroundColor; 149 return kLabelBackgroundColor;
143 150
144 // Textfield 151 // Textfield
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 DrawTiledImage(canvas, *center, 371 DrawTiledImage(canvas, *center,
365 0, 0, 1.0, 1.0, 372 0, 0, 1.0, 1.0,
366 rect.x() + left->width(), rect.y(), 373 rect.x() + left->width(), rect.y(),
367 rect.width() - left->width() - right->width(), 374 rect.width() - left->width() - right->width(),
368 center->height()); 375 center->height());
369 } 376 }
370 } 377 }
371 } 378 }
372 379
373 } // namespace ui 380 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698