| Index: ui/gfx/native_theme_chromeos.cc
|
| diff --git a/ui/gfx/native_theme_chromeos.cc b/ui/gfx/native_theme_chromeos.cc
|
| index 0c08c25a03876bee91947402848676785fe8134c..fcff4b36ad884f14ab39f3cf0d1693efe2186989 100644
|
| --- a/ui/gfx/native_theme_chromeos.cc
|
| +++ b/ui/gfx/native_theme_chromeos.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -71,6 +71,28 @@ const SkColor kProgressBarIndicatorInnerStroke =
|
| const SkColor kProgressBarIndicatorInnerShadow =
|
| SkColorSetARGB(0x54, 0xFF, 0xFF, 0xFF); // 0.33 white
|
|
|
| +// Theme colors returned by GetSystemColor().
|
| +const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
|
| +// Dialogs:
|
| +const SkColor kDefaultDialogBackgroundColor = SkColorSetRGB(200, 200, 200);
|
| +// FocusableBorder:
|
| +const SkColor kDefaultFocusedBorderColor= SkColorSetRGB(0x4D, 0x90, 0xFE);
|
| +const SkColor kDefaultUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9);
|
| +// TextButton:
|
| +const SkColor kDefaultTextButtonBackgroundColor =
|
| + SkColorSetRGB(0xDE, 0xDE, 0xDE);
|
| +const SkColor kDefaultTextButtonEnabledColor = SkColorSetRGB(6, 45, 117);
|
| +const SkColor kDefaultTextButtonDisabledColor = SkColorSetRGB(161, 161, 146);
|
| +const SkColor kDefaultTextButtonHighlightColor =
|
| + SkColorSetARGB(200, 255, 255, 255);
|
| +const SkColor kDefaultTextButtonHoverColor = kDefaultTextButtonEnabledColor;
|
| +// MenuItem:
|
| +const SkColor kDefaultEnabledMenuItemForegroundColor = SK_ColorBLACK;
|
| +const SkColor kDefaultDisabledMenuItemForegroundColor =
|
| + SkColorSetRGB(0x80, 0x80, 0x80);
|
| +const SkColor kDefaultFocusedMenuItemBackgroundColor =
|
| + SkColorSetRGB(0xDC, 0xE4, 0xFA);
|
| +
|
| // Geometry constants
|
|
|
| const int kBorderCornerRadius = 3;
|
| @@ -304,6 +326,49 @@ gfx::Size NativeThemeChromeos::GetPartSize(Part part,
|
| return gfx::Size(width, height);
|
| }
|
|
|
| +SkColor NativeThemeAura::GetSystemColor(ColorId color_id) const {
|
| + // Return hard coded values for ChromeOS.
|
| + // TODO(saintlou) : Remove this module after switch
|
| + switch (color_id) {
|
| +
|
| + // Dialogs
|
| + case kColorId_DialogBackground:
|
| + return kDefaultDialogBackgroundColor;
|
| +
|
| + // FocusableBorder
|
| + case kColorId_FocusedBorderColor:
|
| + return kDefaultFocusedBorderColor;
|
| + case kColorId_UnfocusedBorderColor:
|
| + return kDefaultUnfocusedBorderColor;
|
| +
|
| + // TextButton
|
| + case kColorId_TextButtonBackgroundColor:
|
| + return kDefaultTextButtonBackgroundColor;
|
| + case kColorId_TextButtonEnabledColor:
|
| + return kDefaultTextButtonEnabledColor;
|
| + case kColorId_TextButtonDisabledColor:
|
| + return kDefaultTextButtonDisabledColor;
|
| + case kColorId_TextButtonHighlightColor:
|
| + return kDefaultTextButtonHighlightColor;
|
| + case kColorId_TextButtonHoverColor:
|
| + return kDefaultTextButtonHoverColor;
|
| +
|
| + // MenuItem
|
| + case kColorId_EnabledMenuItemForegroundColor:
|
| + return kDefaultEnabledMenuItemForegroundColor;
|
| + case kColorId_DisabledMenuItemForegroundColor:
|
| + return kDefaultDisabledMenuItemForegroundColor;
|
| + case kColorId_FocusedMenuItemBackgroundColor:
|
| + return kDefaultFocusedMenuItemBackgroundColor;
|
| + default:
|
| + NOTREACHED() << "Invalid color_id: " << color_id;
|
| + break;
|
| + }
|
| +
|
| + // Return InvalidColor
|
| + return kInvalidColorIdColor;
|
| +}
|
| +
|
| void NativeThemeChromeos::PaintScrollbarTrack(
|
| SkCanvas* canvas,
|
| Part part,
|
|
|