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

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

Issue 10310136: ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 8 years, 7 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
« no previous file with comments | « ui/base/native_theme/native_theme_gtk.h ('k') | ui/base/native_theme/native_theme_win.h » ('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/gfx/native_theme_gtk.h" 5 #include "ui/base/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 // TextButton: 23 // TextButton:
24 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde); 24 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde);
25 const SkColor kTextButtonEnabledColor = SkColorSetRGB(6, 45, 117); 25 const SkColor kTextButtonEnabledColor = SkColorSetRGB(6, 45, 117);
26 const SkColor kTextButtonDisabledColor = SkColorSetRGB(161, 161, 146); 26 const SkColor kTextButtonDisabledColor = SkColorSetRGB(161, 161, 146);
27 const SkColor kTextButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255); 27 const SkColor kTextButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255);
28 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor; 28 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor;
29 29
30 } // namespace 30 } // namespace
31 31
32 namespace gfx { 32 namespace ui {
33 33
34 // static 34 // static
35 const NativeTheme* NativeTheme::instance() { 35 const NativeTheme* NativeTheme::instance() {
36 return NativeThemeGtk::instance(); 36 return NativeThemeGtk::instance();
37 } 37 }
38 38
39 // static 39 // static
40 const NativeThemeGtk* NativeThemeGtk::instance() { 40 const NativeThemeGtk* NativeThemeGtk::instance() {
41 CR_DEFINE_STATIC_LOCAL(NativeThemeGtk, s_native_theme, ()); 41 CR_DEFINE_STATIC_LOCAL(NativeThemeGtk, s_native_theme, ());
42 return &s_native_theme; 42 return &s_native_theme;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 } 77 }
78 return kInvalidColorIdColor; 78 return kInvalidColorIdColor;
79 } 79 }
80 80
81 NativeThemeGtk::NativeThemeGtk() { 81 NativeThemeGtk::NativeThemeGtk() {
82 } 82 }
83 83
84 NativeThemeGtk::~NativeThemeGtk() { 84 NativeThemeGtk::~NativeThemeGtk() {
85 } 85 }
86 86
87 } // namespace gfx 87 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/native_theme/native_theme_gtk.h ('k') | ui/base/native_theme/native_theme_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698