diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 23:10:10 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 23:10:10 +0000 |
| commit | 1e25fbf5e01d0ea8045c43288ee58fc7d0b3a3a2 (patch) | |
| tree | 9f277e5e69c7b6a9586f827d425d6b66ea29d466 /ui/ui.gyp | |
| parent | 84d9ab4c2dc42dd7d18672c2855c92589bf9208b (diff) | |
| download | chromium_src-1e25fbf5e01d0ea8045c43288ee58fc7d0b3a3a2.zip chromium_src-1e25fbf5e01d0ea8045c43288ee58fc7d0b3a3a2.tar.gz chromium_src-1e25fbf5e01d0ea8045c43288ee58fc7d0b3a3a2.tar.bz2 | |
Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory.
BUG=103304,125844
R=ben@chromium.org
TBR=tony@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10310136
TBR=tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10387121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 44 |
1 files changed, 22 insertions, 22 deletions
@@ -212,18 +212,6 @@ 'base/models/tree_model.h', 'base/models/tree_node_iterator.h', 'base/models/tree_node_model.h', - 'base/native_theme/native_theme.cc', - 'base/native_theme/native_theme.h', - 'base/native_theme/native_theme_android.cc', - 'base/native_theme/native_theme_android.h', - 'base/native_theme/native_theme_aura.cc', - 'base/native_theme/native_theme_aura.h', - 'base/native_theme/native_theme_base.cc', - 'base/native_theme/native_theme_base.h', - 'base/native_theme/native_theme_gtk.cc', - 'base/native_theme/native_theme_gtk.h', - 'base/native_theme/native_theme_win.cc', - 'base/native_theme/native_theme_win.h', 'base/range/range.cc', 'base/range/range.h', 'base/range/range_mac.mm', @@ -344,6 +332,18 @@ 'gfx/mac/scoped_ns_disable_screen_updates.h', 'gfx/monitor.cc', 'gfx/monitor.h', + 'gfx/native_theme.cc', + 'gfx/native_theme.h', + 'gfx/native_theme_android.cc', + 'gfx/native_theme_android.h', + 'gfx/native_theme_aura.cc', + 'gfx/native_theme_aura.h', + 'gfx/native_theme_base.cc', + 'gfx/native_theme_base.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', @@ -452,8 +452,8 @@ ], }, { # use_aura!=1 'sources!': [ - 'base/native_theme/native_theme_aura.cc', - 'base/native_theme/native_theme_aura.h', + 'gfx/native_theme_aura.cc', + 'gfx/native_theme_aura.h', 'base/cursor/cursor.cc', 'base/cursor/cursor.h', 'base/cursor/cursor_win.cc', @@ -464,8 +464,8 @@ 'sources/': [ ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'], ['exclude', 'base/dragdrop/os_exchange_data_provider_win.h'], - ['exclude', 'base/native_theme/native_theme_win.cc'], - ['exclude', 'base/native_theme/native_theme_win.h'], + ['exclude', 'gfx/native_theme_win.cc'], + ['exclude', 'gfx/native_theme_win.h'], ['exclude', 'gfx/path_win.cc'], ], }], @@ -534,18 +534,18 @@ ], }, { # toolkit_uses_gtk != 1 'sources!': [ - 'base/native_theme/native_theme_gtk.cc', - 'base/native_theme/native_theme_gtk.h', + 'gfx/native_theme_gtk.cc', + 'gfx/native_theme_gtk.h', ] }], ['OS=="win"', { 'sources': [ - 'base/native_theme/native_theme_win.cc', - 'base/native_theme/native_theme_win.h', 'gfx/gdi_util.cc', 'gfx/gdi_util.h', 'gfx/icon_util.cc', 'gfx/icon_util.h', + 'gfx/native_theme_win.cc', + 'gfx/native_theme_win.h', ], 'sources!': [ 'base/touch/touch_factory.cc', @@ -594,8 +594,8 @@ 'base/dragdrop/drop_target.cc', 'base/dragdrop/drop_target.h', 'base/dragdrop/os_exchange_data.cc', - 'base/native_theme/native_theme_win.cc', - 'base/native_theme/native_theme_win.h', + 'gfx/native_theme_win.cc', + 'gfx/native_theme_win.h', ], 'sources/': [ ['exclude', '^base/win/*'], |