From 5e554e8fbf652534b50c89e2ffafaeb96161cc80 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Mon, 28 Nov 2011 15:33:33 +0000 Subject: views: Move menu directory to ui/views/controls/. BUG=104039 R=maruel@chromium.org TBR=ben@chromium.org Review URL: http://codereview.chromium.org/8718004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111701 0039d316-1c4b-4281-b951-d872f2087c98 --- views/views.gyp | 122 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 61 deletions(-) (limited to 'views/views.gyp') diff --git a/views/views.gyp b/views/views.gyp index 7c2b694..d9e4112 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -61,60 +61,6 @@ 'controls/link.cc', 'controls/link.h', 'controls/link_listener.h', - 'controls/menu/menu.cc', - 'controls/menu/menu.h', - 'controls/menu/menu_2.cc', - 'controls/menu/menu_2.h', - 'controls/menu/menu_config.cc', - 'controls/menu/menu_config.h', - 'controls/menu/menu_config_aura.cc', - 'controls/menu/menu_config_linux.cc', - 'controls/menu/menu_config_win.cc', - 'controls/menu/menu_controller.cc', - 'controls/menu/menu_controller.h', - 'controls/menu/menu_controller_delegate.h', - 'controls/menu/menu_delegate.cc', - 'controls/menu/menu_delegate.h', - 'controls/menu/menu_gtk.cc', - 'controls/menu/menu_gtk.h', - 'controls/menu/menu_host.cc', - 'controls/menu/menu_host.h', - 'controls/menu/menu_host_root_view.cc', - 'controls/menu/menu_host_root_view.h', - 'controls/menu/menu_item_view.cc', - 'controls/menu/menu_item_view.h', - 'controls/menu/menu_item_view_aura.cc', - 'controls/menu/menu_item_view_linux.cc', - 'controls/menu/menu_item_view_win.cc', - 'controls/menu/menu_listener.h', - 'controls/menu/menu_model_adapter.cc', - 'controls/menu/menu_model_adapter.h', - 'controls/menu/menu_runner.cc', - 'controls/menu/menu_runner.h', - 'controls/menu/menu_scroll_view_container.cc', - 'controls/menu/menu_scroll_view_container.h', - 'controls/menu/menu_separator.h', - 'controls/menu/menu_separator_aura.cc', - 'controls/menu/menu_separator_linux.cc', - 'controls/menu/menu_separator_win.cc', - 'controls/menu/menu_win.cc', - 'controls/menu/menu_win.h', - 'controls/menu/menu_wrapper.h', - 'controls/menu/native_menu_gtk.cc', - 'controls/menu/native_menu_gtk.h', - 'controls/menu/native_menu_host.h', - 'controls/menu/native_menu_host_delegate.h', - 'controls/menu/native_menu_views.cc', - 'controls/menu/native_menu_views.h', - 'controls/menu/native_menu_win.cc', - 'controls/menu/native_menu_win.h', - 'controls/menu/nested_dispatcher_gtk.cc', - 'controls/menu/nested_dispatcher_gtk.h', - 'controls/menu/menu_image_util.cc', - 'controls/menu/menu_image_util.h', - 'controls/menu/submenu_view.cc', - 'controls/menu/submenu_view.h', - 'controls/menu/view_menu_delegate.h', 'controls/message_box_view.cc', 'controls/message_box_view.h', 'controls/native_control.cc', @@ -209,6 +155,60 @@ '../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/menu/menu.cc', + '../ui/views/controls/menu/menu.h', + '../ui/views/controls/menu/menu_2.cc', + '../ui/views/controls/menu/menu_2.h', + '../ui/views/controls/menu/menu_config.cc', + '../ui/views/controls/menu/menu_config.h', + '../ui/views/controls/menu/menu_config_aura.cc', + '../ui/views/controls/menu/menu_config_linux.cc', + '../ui/views/controls/menu/menu_config_win.cc', + '../ui/views/controls/menu/menu_controller.cc', + '../ui/views/controls/menu/menu_controller.h', + '../ui/views/controls/menu/menu_controller_delegate.h', + '../ui/views/controls/menu/menu_delegate.cc', + '../ui/views/controls/menu/menu_delegate.h', + '../ui/views/controls/menu/menu_gtk.cc', + '../ui/views/controls/menu/menu_gtk.h', + '../ui/views/controls/menu/menu_host.cc', + '../ui/views/controls/menu/menu_host.h', + '../ui/views/controls/menu/menu_host_root_view.cc', + '../ui/views/controls/menu/menu_host_root_view.h', + '../ui/views/controls/menu/menu_item_view.cc', + '../ui/views/controls/menu/menu_item_view.h', + '../ui/views/controls/menu/menu_item_view_aura.cc', + '../ui/views/controls/menu/menu_item_view_linux.cc', + '../ui/views/controls/menu/menu_item_view_win.cc', + '../ui/views/controls/menu/menu_listener.h', + '../ui/views/controls/menu/menu_model_adapter.cc', + '../ui/views/controls/menu/menu_model_adapter.h', + '../ui/views/controls/menu/menu_runner.cc', + '../ui/views/controls/menu/menu_runner.h', + '../ui/views/controls/menu/menu_scroll_view_container.cc', + '../ui/views/controls/menu/menu_scroll_view_container.h', + '../ui/views/controls/menu/menu_separator.h', + '../ui/views/controls/menu/menu_separator_aura.cc', + '../ui/views/controls/menu/menu_separator_linux.cc', + '../ui/views/controls/menu/menu_separator_win.cc', + '../ui/views/controls/menu/menu_win.cc', + '../ui/views/controls/menu/menu_win.h', + '../ui/views/controls/menu/menu_wrapper.h', + '../ui/views/controls/menu/native_menu_gtk.cc', + '../ui/views/controls/menu/native_menu_gtk.h', + '../ui/views/controls/menu/native_menu_host.h', + '../ui/views/controls/menu/native_menu_host_delegate.h', + '../ui/views/controls/menu/native_menu_views.cc', + '../ui/views/controls/menu/native_menu_views.h', + '../ui/views/controls/menu/native_menu_win.cc', + '../ui/views/controls/menu/native_menu_win.h', + '../ui/views/controls/menu/nested_dispatcher_gtk.cc', + '../ui/views/controls/menu/nested_dispatcher_gtk.h', + '../ui/views/controls/menu/menu_image_util.cc', + '../ui/views/controls/menu/menu_image_util.h', + '../ui/views/controls/menu/submenu_view.cc', + '../ui/views/controls/menu/submenu_view.h', + '../ui/views/controls/menu/view_menu_delegate.h', '../ui/views/controls/native/native_view_host.cc', '../ui/views/controls/native/native_view_host.h', '../ui/views/controls/native/native_view_host_aura.cc', @@ -390,15 +390,15 @@ 'sources/': [ ['exclude', '_(gtk|x)\\.cc$'], ['exclude', '/(gtk|x)_[^/]*\\.cc$'], - ['exclude', 'controls/menu/menu_2.*'], + ['exclude', '../ui/views/controls/menu/menu_2.*'], ], 'sources!': [ - 'controls/menu/menu_config_linux.cc', - 'controls/menu/menu_item_view_linux.cc', - 'controls/menu/menu_separator_linux.cc', 'controls/native_control.cc', 'controls/native_control.h', 'drag_utils_win.cc', + '../ui/views/controls/menu/menu_config_linux.cc', + '../ui/views/controls/menu/menu_item_view_linux.cc', + '../ui/views/controls/menu/menu_separator_linux.cc', '../ui/views/controls/scrollbar/bitmap_scroll_bar.cc', '../ui/views/controls/scrollbar/bitmap_scroll_bar.h', '../ui/views/controls/tabbed_pane/tabbed_pane.cc', @@ -442,8 +442,8 @@ }], ['use_aura==0', { 'sources!': [ - 'controls/menu/native_menu_views.cc', - 'controls/menu/native_menu_views.h', + '../ui/views/controls/menu/native_menu_views.cc', + '../ui/views/controls/menu/native_menu_views.h', '../ui/views/widget/tooltip_manager_views.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/menu/menu_model_adapter_unittest.cc', '../ui/views/controls/scrollbar/scrollbar_unittest.cc', '../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc', '../ui/views/controls/table/table_view_unittest.cc', @@ -539,7 +540,6 @@ 'controls/label_unittest.cc', 'controls/progress_bar_unittest.cc', 'controls/single_split_view_unittest.cc', - 'controls/menu/menu_model_adapter_unittest.cc', 'run_all_unittests.cc', 'view_unittest.cc', -- cgit v1.1