Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: ui/views/views.gyp

Issue 267593005: Refactor menu controller to isolate aura dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index e993bd025708265345d7e1e2f11a282b6ed8cfc1..9e912f86657601cdbb29067376fef6299b37103b 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -14,11 +14,7 @@
],
}, {
'sources/': [
- ['exclude', '^controls/combobox/'],
['exclude', '^controls/native/'],
- ['exclude', '^controls/scrollbar/'],
- ['exclude', '^controls/table/'],
- ['exclude', '^controls/tree/'],
['exclude', '^corewm/'],
['exclude', '^touchui/'],
['exclude', '^widget/desktop_aura/']
@@ -135,6 +131,7 @@
'controls/link.h',
'controls/link_listener.h',
'controls/menu/display_change_listener_aura.cc',
+ 'controls/menu/display_change_listener_mac.cc',
'controls/menu/menu.cc',
'controls/menu/menu.h',
'controls/menu/menu_2.cc',
@@ -153,6 +150,11 @@
'controls/menu/menu_delegate.h',
'controls/menu/menu_message_pump_dispatcher_win.cc',
'controls/menu/menu_message_pump_dispatcher_win.h',
+ 'controls/menu/menu_message_loop.h',
+ 'controls/menu/menu_message_loop_aura.cc',
+ 'controls/menu/menu_message_loop_aura.h',
+ 'controls/menu/menu_message_loop_mac.cc',
+ 'controls/menu/menu_message_loop_mac.h',
'controls/menu/menu_host.cc',
'controls/menu/menu_host.h',
'controls/menu/menu_host_root_view.cc',
@@ -167,7 +169,6 @@
'controls/menu/menu_runner.cc',
'controls/menu/menu_runner.h',
'controls/menu/menu_runner_handler.h',
- 'controls/menu/menu_runner_mac.mm',
tapted 2014/05/06 00:02:46 I think you can rebase on master and land this pri
Andre 2014/05/07 23:12:39 Done.
'controls/menu/menu_scroll_view_container.cc',
'controls/menu/menu_scroll_view_container.h',
'controls/menu/menu_separator.h',
@@ -535,24 +536,6 @@
'sources!': [
'bubble/bubble_window_targeter.cc',
'bubble/bubble_window_targeter.h',
- 'controls/menu/menu_controller.cc',
- 'controls/menu/menu_controller.h',
- 'controls/menu/menu_item_view.cc',
- 'controls/menu/menu_item_view.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_model_adapter.cc',
- 'controls/menu/menu_model_adapter.h',
- 'controls/menu/menu_runner.cc',
- 'controls/menu/menu_scroll_view_container.cc',
- 'controls/menu/menu_scroll_view_container.h',
- 'controls/menu/menu_separator_views.cc',
- 'controls/menu/submenu_view.cc',
- 'controls/menu/submenu_view.h',
- 'controls/scroll_view.cc',
- 'controls/scroll_view.h',
'mouse_watcher_view_host.cc',
'mouse_watcher_view_host.h',
'widget/window_reorderer.cc',

Powered by Google App Engine
This is Rietveld 408576698