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

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

Issue 12483006: wrench_menu: use NativeTheme colors under aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unused constant in common_theme.cc 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_gtk.h" 5 #include "ui/native_theme/native_theme_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "ui/gfx/skia_utils_gtk.h" 11 #include "ui/gfx/skia_utils_gtk.h"
12 12
13 namespace { 13 namespace {
14 14
15 const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128); 15 const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
16 16
17 // Theme colors returned by GetSystemColor(). 17 // Theme colors returned by GetSystemColor().
18 18
19 // FocusableBorder: 19 // FocusableBorder:
20 const SkColor kFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE); 20 const SkColor kFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE);
21 const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9); 21 const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9);
22 22
23 // MenuItem
24 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetARGB(13, 0, 0, 0);
25 const SkColor kHoverMenuItemBackgroundColor = SkColorSetRGB(204, 204, 204);
26 const SkColor kEnabledMenuItemBorderColor = SkColorSetARGB(36, 0, 0, 0);
27 const SkColor kFocusedMenuItemBorderColor = SkColorSetARGB(72, 0, 0, 0);
28 const SkColor kHoverMenuItemBorderColor = SkColorSetARGB(72, 0, 0, 0);
29
23 // TextButton: 30 // TextButton:
24 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde); 31 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde);
25 const SkColor kTextButtonEnabledColor = SkColorSetRGB(6, 45, 117); 32 const SkColor kTextButtonEnabledColor = SkColorSetRGB(6, 45, 117);
26 const SkColor kTextButtonDisabledColor = SkColorSetRGB(161, 161, 146); 33 const SkColor kTextButtonDisabledColor = SkColorSetRGB(161, 161, 146);
27 const SkColor kTextButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255); 34 const SkColor kTextButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255);
28 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor; 35 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor;
29 36
30 } // namespace 37 } // namespace
31 38
32 namespace ui { 39 namespace ui {
(...skipping 19 matching lines...) Expand all
52 // chromium-os bug 23461). Need to figure out the right thing and do it. 59 // chromium-os bug 23461). Need to figure out the right thing and do it.
53 return gfx::GdkColorToSkColor( 60 return gfx::GdkColorToSkColor(
54 gtk_widget_get_default_style()->bg[GTK_STATE_NORMAL]); 61 gtk_widget_get_default_style()->bg[GTK_STATE_NORMAL]);
55 62
56 // FocusableBorder: 63 // FocusableBorder:
57 case kColorId_FocusedBorderColor: 64 case kColorId_FocusedBorderColor:
58 return kFocusedBorderColor; 65 return kFocusedBorderColor;
59 case kColorId_UnfocusedBorderColor: 66 case kColorId_UnfocusedBorderColor:
60 return kUnfocusedBorderColor; 67 return kUnfocusedBorderColor;
61 68
69 // MenuItem
70 case kColorId_FocusedMenuItemBackgroundColor:
71 return kFocusedMenuItemBackgroundColor;
72 case kColorId_HoverMenuItemBackgroundColor:
73 return kHoverMenuItemBackgroundColor;
74 case kColorId_EnabledMenuItemBorderColor:
75 return kEnabledMenuItemBorderColor;
76 case kColorId_FocusedMenuItemBorderColor:
77 return kFocusedMenuItemBorderColor;
78 case kColorId_HoverMenuItemBorderColor:
79 return kHoverMenuItemBorderColor;
80
62 // TextButton: 81 // TextButton:
63 case kColorId_TextButtonBackgroundColor: 82 case kColorId_TextButtonBackgroundColor:
64 return kTextButtonBackgroundColor; 83 return kTextButtonBackgroundColor;
65 case kColorId_TextButtonEnabledColor: 84 case kColorId_TextButtonEnabledColor:
66 return kTextButtonEnabledColor; 85 return kTextButtonEnabledColor;
67 case kColorId_TextButtonDisabledColor: 86 case kColorId_TextButtonDisabledColor:
68 return kTextButtonDisabledColor; 87 return kTextButtonDisabledColor;
69 case kColorId_TextButtonHighlightColor: 88 case kColorId_TextButtonHighlightColor:
70 return kTextButtonHighlightColor; 89 return kTextButtonHighlightColor;
71 case kColorId_TextButtonHoverColor: 90 case kColorId_TextButtonHoverColor:
72 return kTextButtonHoverColor; 91 return kTextButtonHoverColor;
73 92
74 default: 93 default:
75 NOTREACHED() << "Invalid color_id: " << color_id; 94 NOTREACHED() << "Invalid color_id: " << color_id;
76 break; 95 break;
77 } 96 }
78 return kInvalidColorIdColor; 97 return kInvalidColorIdColor;
79 } 98 }
80 99
81 NativeThemeGtk::NativeThemeGtk() { 100 NativeThemeGtk::NativeThemeGtk() {
82 } 101 }
83 102
84 NativeThemeGtk::~NativeThemeGtk() { 103 NativeThemeGtk::~NativeThemeGtk() {
85 } 104 }
86 105
87 } // namespace ui 106 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698