summaryrefslogtreecommitdiffstats
path: root/views/views.gyp
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 12:07:10 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 12:07:10 +0000
commit4c1bd635cf5de020499655d545e543583e3f7e21 (patch)
tree991ec35ee6c6a2e34461055bfc83b46a729bebc8 /views/views.gyp
parent791b9e1b644d679f488b477849ae7a3f23782bf0 (diff)
downloadchromium_src-4c1bd635cf5de020499655d545e543583e3f7e21.zip
chromium_src-4c1bd635cf5de020499655d545e543583e3f7e21.tar.gz
chromium_src-4c1bd635cf5de020499655d545e543583e3f7e21.tar.bz2
views: Move label and link files to ui/views/controls/.
BUG=104039 R=ben@chromium.org TBR=stevenjb@chromium.org Review URL: http://codereview.chromium.org/8729013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
-rw-r--r--views/views.gyp12
1 files changed, 6 insertions, 6 deletions
diff --git a/views/views.gyp b/views/views.gyp
index d9e4112..841adb2 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -56,11 +56,6 @@
'controls/focusable_border.h',
'controls/image_view.cc',
'controls/image_view.h',
- 'controls/label.cc',
- 'controls/label.h',
- 'controls/link.cc',
- 'controls/link.h',
- 'controls/link_listener.h',
'controls/message_box_view.cc',
'controls/message_box_view.h',
'controls/native_control.cc',
@@ -155,6 +150,11 @@
'../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/label.cc',
+ '../ui/views/controls/label.h',
+ '../ui/views/controls/link.cc',
+ '../ui/views/controls/link.h',
+ '../ui/views/controls/link_listener.h',
'../ui/views/controls/menu/menu.cc',
'../ui/views/controls/menu/menu.h',
'../ui/views/controls/menu/menu_2.cc',
@@ -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/label_unittest.cc',
'../ui/views/controls/menu/menu_model_adapter_unittest.cc',
'../ui/views/controls/scrollbar/scrollbar_unittest.cc',
'../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc',
@@ -537,7 +538,6 @@
'../ui/views/widget/native_widget_win_unittest.cc',
'../ui/views/widget/widget_unittest.cc',
'accessible_pane_view_unittest.cc',
- 'controls/label_unittest.cc',
'controls/progress_bar_unittest.cc',
'controls/single_split_view_unittest.cc',
'run_all_unittests.cc',