diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 20:20:35 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 20:20:35 +0000 |
| commit | 72bcfc775d748a460876d7ff04cfacad07b4496b (patch) | |
| tree | 10d6469a991fa16d3e720ad3cf82b8d65e2dccd4 /views/views.gyp | |
| parent | 6ea7e2a32b0831bd75ac01ae60731ade971bc6e3 (diff) | |
| download | chromium_src-72bcfc775d748a460876d7ff04cfacad07b4496b.zip chromium_src-72bcfc775d748a460876d7ff04cfacad07b4496b.tar.gz chromium_src-72bcfc775d748a460876d7ff04cfacad07b4496b.tar.bz2 | |
views: Move tabbed_pane directory to ui/views/controls/.
BUG=104039
R=maruel@chromium.org
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8658009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/views/views.gyp b/views/views.gyp index 1e75213..c98573a 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -178,14 +178,6 @@ 'controls/single_split_view.cc', 'controls/single_split_view.h', 'controls/single_split_view_listener.h', - 'controls/tabbed_pane/native_tabbed_pane_gtk.cc', - 'controls/tabbed_pane/native_tabbed_pane_gtk.h', - 'controls/tabbed_pane/native_tabbed_pane_win.cc', - 'controls/tabbed_pane/native_tabbed_pane_win.h', - 'controls/tabbed_pane/native_tabbed_pane_wrapper.h', - 'controls/tabbed_pane/tabbed_pane.cc', - 'controls/tabbed_pane/tabbed_pane.h', - 'controls/tabbed_pane/tabbed_pane_listener.h', 'controls/textfield/gtk_views_entry.cc', 'controls/textfield/gtk_views_entry.h', 'controls/textfield/gtk_views_textview.cc', @@ -260,6 +252,14 @@ '../ui/views/controls/combobox/native_combobox_win.cc', '../ui/views/controls/combobox/native_combobox_win.h', '../ui/views/controls/combobox/native_combobox_wrapper.h', + '../ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc', + '../ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.h', + '../ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc', + '../ui/views/controls/tabbed_pane/native_tabbed_pane_win.h', + '../ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h', + '../ui/views/controls/tabbed_pane/tabbed_pane.cc', + '../ui/views/controls/tabbed_pane/tabbed_pane.h', + '../ui/views/controls/tabbed_pane/tabbed_pane_listener.h', '../ui/views/controls/table/native_table_wrapper.h', '../ui/views/controls/table/native_table_gtk.cc', '../ui/views/controls/table/native_table_gtk.h', @@ -400,9 +400,9 @@ 'controls/native_control.h', 'controls/scrollbar/bitmap_scroll_bar.cc', 'controls/scrollbar/bitmap_scroll_bar.h', - 'controls/tabbed_pane/tabbed_pane.cc', - 'controls/tabbed_pane/tabbed_pane.h', 'drag_utils_win.cc', + '../ui/views/controls/tabbed_pane/tabbed_pane.cc', + '../ui/views/controls/tabbed_pane/tabbed_pane.h', '../ui/views/controls/table/group_table_view.cc', '../ui/views/controls/table/group_table_view.h', '../ui/views/controls/table/native_table_wrapper.h', @@ -510,6 +510,7 @@ '../ui/views/bubble/bubble_delegate_unittest.cc', '../ui/views/bubble/bubble_frame_view_unittest.cc', '../ui/views/controls/combobox/native_combobox_views_unittest.cc', + '../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc', '../ui/views/controls/table/table_view_unittest.cc', '../ui/views/events/event_unittest.cc', '../ui/views/focus/accelerator_handler_gtk_unittest.cc', @@ -535,7 +536,6 @@ 'controls/label_unittest.cc', 'controls/progress_bar_unittest.cc', 'controls/single_split_view_unittest.cc', - 'controls/tabbed_pane/tabbed_pane_unittest.cc', 'controls/menu/menu_model_adapter_unittest.cc', 'controls/textfield/native_textfield_views_unittest.cc', 'controls/textfield/textfield_views_model_unittest.cc', @@ -577,9 +577,9 @@ ], 'sources/': [ ['exclude', '../ui/views/controls/combobox/native_combobox_views_unittest.cc'], + ['exclude', '../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc'], ['exclude', '../ui/views/controls/table/table_view_unittest.cc'], ['exclude', '../ui/views/widget/native_widget_win_unittest.cc'], - ['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'], ], }, { 'sources/': [ |