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

Side by Side Diff: ui/gfx/native_theme_chromeos.cc

Issue 9101004: Factor more colors into NativeTheme. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright. Created 8 years, 11 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) 2011 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/gfx/native_theme_chromeos.h" 5 #include "ui/gfx/native_theme_chromeos.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "grit/gfx_resources.h" 9 #include "grit/gfx_resources.h"
10 #include "third_party/skia/include/effects/SkGradientShader.h" 10 #include "third_party/skia/include/effects/SkGradientShader.h"
11 #include "third_party/skia/include/core/SkPaint.h" 11 #include "third_party/skia/include/core/SkPaint.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 const SkColor kProgressBarIndicatorStroke = SkColorSetRGB(0x4A, 0x4A, 0x4A); 65 const SkColor kProgressBarIndicatorStroke = SkColorSetRGB(0x4A, 0x4A, 0x4A);
66 const SkColor kProgressBarIndicatorDisabledStroke = 66 const SkColor kProgressBarIndicatorDisabledStroke =
67 SkColorSetARGB(0x80, 0x4A, 0x4A, 0x4A); 67 SkColorSetARGB(0x80, 0x4A, 0x4A, 0x4A);
68 68
69 const SkColor kProgressBarIndicatorInnerStroke = 69 const SkColor kProgressBarIndicatorInnerStroke =
70 SkColorSetARGB(0x3F, 0xFF, 0xFF, 0xFF); // 0.25 white 70 SkColorSetARGB(0x3F, 0xFF, 0xFF, 0xFF); // 0.25 white
71 const SkColor kProgressBarIndicatorInnerShadow = 71 const SkColor kProgressBarIndicatorInnerShadow =
72 SkColorSetARGB(0x54, 0xFF, 0xFF, 0xFF); // 0.33 white 72 SkColorSetARGB(0x54, 0xFF, 0xFF, 0xFF); // 0.33 white
73 73
74 // Theme colors returned by GetSystemColor().
75 const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
76 // Dialogs:
77 const SkColor kDefaultDialogBackgroundColor = SkColorSetRGB(200, 200, 200);
78 // FocusableBorder:
79 const SkColor kDefaultFocusedBorderColor= SkColorSetRGB(0x4D, 0x90, 0xFE);
80 const SkColor kDefaultUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9);
81 // TextButton:
82 const SkColor kDefaultTextButtonBackgroundColor =
83 SkColorSetRGB(0xDE, 0xDE, 0xDE);
84 const SkColor kDefaultTextButtonEnabledColor = SkColorSetRGB(6, 45, 117);
85 const SkColor kDefaultTextButtonDisabledColor = SkColorSetRGB(161, 161, 146);
86 const SkColor kDefaultTextButtonHighlightColor =
87 SkColorSetARGB(200, 255, 255, 255);
88 const SkColor kDefaultTextButtonHoverColor = kDefaultTextButtonEnabledColor;
89 // MenuItem:
90 const SkColor kDefaultEnabledMenuItemForegroundColor = SK_ColorBLACK;
91 const SkColor kDefaultDisabledMenuItemForegroundColor =
92 SkColorSetRGB(0x80, 0x80, 0x80);
93 const SkColor kDefaultFocusedMenuItemBackgroundColor =
94 SkColorSetRGB(0xDC, 0xE4, 0xFA);
95
74 // Geometry constants 96 // Geometry constants
75 97
76 const int kBorderCornerRadius = 3; 98 const int kBorderCornerRadius = 3;
77 99
78 const int kRadioIndicatorSize = 7; 100 const int kRadioIndicatorSize = 7;
79 101
80 const int kSliderThumbWidth = 16; 102 const int kSliderThumbWidth = 16;
81 const int kSliderThumbHeight = 16; 103 const int kSliderThumbHeight = 16;
82 const int kSliderTrackSize = 6; 104 const int kSliderTrackSize = 6;
83 105
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 height = kSliderThumbHeight; 319 height = kSliderThumbHeight;
298 break; 320 break;
299 case kInnerSpinButton: 321 case kInnerSpinButton:
300 return gfx::Size(kScrollbarWidth, 0); 322 return gfx::Size(kScrollbarWidth, 0);
301 default: 323 default:
302 return NativeThemeBase::GetPartSize(part, state, extra); 324 return NativeThemeBase::GetPartSize(part, state, extra);
303 } 325 }
304 return gfx::Size(width, height); 326 return gfx::Size(width, height);
305 } 327 }
306 328
329 SkColor NativeThemeAura::GetSystemColor(ColorId color_id) const {
330 // Return hard coded values for ChromeOS.
331 // TODO(saintlou) : Remove this module after switch
332 switch (color_id) {
333
334 // Dialogs
335 case kColorId_DialogBackground:
336 return kDefaultDialogBackgroundColor;
337
338 // FocusableBorder
339 case kColorId_FocusedBorderColor:
340 return kDefaultFocusedBorderColor;
341 case kColorId_UnfocusedBorderColor:
342 return kDefaultUnfocusedBorderColor;
343
344 // TextButton
345 case kColorId_TextButtonBackgroundColor:
346 return kDefaultTextButtonBackgroundColor;
347 case kColorId_TextButtonEnabledColor:
348 return kDefaultTextButtonEnabledColor;
349 case kColorId_TextButtonDisabledColor:
350 return kDefaultTextButtonDisabledColor;
351 case kColorId_TextButtonHighlightColor:
352 return kDefaultTextButtonHighlightColor;
353 case kColorId_TextButtonHoverColor:
354 return kDefaultTextButtonHoverColor;
355
356 // MenuItem
357 case kColorId_EnabledMenuItemForegroundColor:
358 return kDefaultEnabledMenuItemForegroundColor;
359 case kColorId_DisabledMenuItemForegroundColor:
360 return kDefaultDisabledMenuItemForegroundColor;
361 case kColorId_FocusedMenuItemBackgroundColor:
362 return kDefaultFocusedMenuItemBackgroundColor;
363 default:
364 NOTREACHED() << "Invalid color_id: " << color_id;
365 break;
366 }
367
368 // Return InvalidColor
369 return kInvalidColorIdColor;
370 }
371
307 void NativeThemeChromeos::PaintScrollbarTrack( 372 void NativeThemeChromeos::PaintScrollbarTrack(
308 SkCanvas* canvas, 373 SkCanvas* canvas,
309 Part part, 374 Part part,
310 State state, 375 State state,
311 const ScrollbarTrackExtraParams& extra_params, 376 const ScrollbarTrackExtraParams& extra_params,
312 const gfx::Rect& rect) const { 377 const gfx::Rect& rect) const {
313 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 378 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
314 if (part == kScrollbarVerticalTrack) { 379 if (part == kScrollbarVerticalTrack) {
315 SkBitmap* background = rb.GetBitmapNamed(IDR_SCROLL_BACKGROUND); 380 SkBitmap* background = rb.GetBitmapNamed(IDR_SCROLL_BACKGROUND);
316 SkBitmap* border_up = rb.GetBitmapNamed(IDR_SCROLL_BACKGROUND_BORDER_UP); 381 SkBitmap* border_up = rb.GetBitmapNamed(IDR_SCROLL_BACKGROUND_BORDER_UP);
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 818
754 if (stroke_border) { 819 if (stroke_border) {
755 SkPaint stroke_paint; 820 SkPaint stroke_paint;
756 GetStrokePaint(state, &stroke_paint); 821 GetStrokePaint(state, &stroke_paint);
757 canvas->drawPath(border, stroke_paint); 822 canvas->drawPath(border, stroke_paint);
758 } 823 }
759 } 824 }
760 825
761 } // namespace gfx 826 } // namespace gfx
762 827
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698