diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 22:21:02 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 22:21:02 +0000 |
| commit | e8d6b9f3973dbef4cc61647078015bdea7522a6d (patch) | |
| tree | 3426cd86f30d21e07d74b53ad1fa78b954a7eb26 /ui/ui.gyp | |
| parent | 9193d2f406ce80e36bcb17cdf59badb844e719bc (diff) | |
| download | chromium_src-e8d6b9f3973dbef4cc61647078015bdea7522a6d.zip chromium_src-e8d6b9f3973dbef4cc61647078015bdea7522a6d.tar.gz chromium_src-e8d6b9f3973dbef4cc61647078015bdea7522a6d.tar.bz2 | |
Aura - Add NativeThemeAura, extract NativeThemeGtk, add sample widget window.
+ Add native_theme_aura and native_theme_gtk, fix button background colors
+ Fix native_theme_chromeos instance generation
+ Rename button-related image resources
+ Rename class NativeThemeLinux to NativeThemeBase
+ Add window showing sample widgets
BUG=98305
TEST=manual
Review URL: http://codereview.chromium.org/8199021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 36 |
1 files changed, 32 insertions, 4 deletions
@@ -255,6 +255,16 @@ 'gfx/mac/scoped_ns_disable_screen_updates.h', 'gfx/native_theme.cc', 'gfx/native_theme.h', + 'gfx/native_theme_aura.cc', + 'gfx/native_theme_aura.h', + 'gfx/native_theme_base.cc', + 'gfx/native_theme_base.h', + 'gfx/native_theme_chromeos.cc', + 'gfx/native_theme_chromeos.h', + 'gfx/native_theme_gtk.cc', + 'gfx/native_theme_gtk.h', + 'gfx/native_theme_win.cc', + 'gfx/native_theme_win.h', 'gfx/native_widget_types.h', 'gfx/pango_util.h', 'gfx/pango_util.cc', @@ -317,10 +327,17 @@ ['exclude', 'base/x/active_window_watcher_x.cc'], ['exclude', 'base/x/active_window_watcher_x.h'], ], + }, { # use_aura!=1 + 'sources!': [ + 'gfx/native_theme_aura.cc', + 'gfx/native_theme_aura.h', + ] }], ['use_aura==1 and OS=="win"', { 'sources/': [ ['exclude', 'base/dragdrop/os_exchange_data_provider_aura.cc'], + ['exclude', 'gfx/native_theme_win.cc'], + ['exclude', 'gfx/native_theme_win.h'], ['exclude', 'gfx/path_win.cc'], ], }], @@ -336,8 +353,6 @@ 'sources': [ 'gfx/linux_util.cc', 'gfx/linux_util.h', - 'gfx/native_theme_linux.cc', - 'gfx/native_theme_linux.h', ], 'link_settings': { 'libraries': [ @@ -379,6 +394,11 @@ 'sources!': [ 'base/clipboard/clipboard_aura.cc', ], + }, { # toolkit_uses_gtk != 1 + 'sources!': [ + 'gfx/native_theme_gtk.cc', + 'gfx/native_theme_gtk.h', + ] }], ['use_wayland == 1', { 'sources/': [ @@ -456,6 +476,8 @@ 'base/dragdrop/os_exchange_data.cc', 'base/view_prop.cc', 'base/view_prop.h', + 'gfx/native_theme_win.cc', + 'gfx/native_theme_win.h', ], 'sources/': [ ['exclude', '^base/win/*'], @@ -502,10 +524,16 @@ ], }], ['chromeos==1', { - 'sources': [ + # On Chrome OS we replace the default GTK look with a special look. + 'sources!': [ + 'gfx/native_theme_gtk.cc', + 'gfx/native_theme_gtk.h', + ] + }, { # chromeos != 1 + 'sources!': [ 'gfx/native_theme_chromeos.cc', 'gfx/native_theme_chromeos.h', - ], + ] }], ['toolkit_views==0', { 'sources!': [ |