Refactor menu controller to isolate aura dependency.

ui/views/views.gyp

Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 9e25f2a1da39ecf1420a595aea832a3f71442e8a..5acefc847b2bb97daad22ee8e908a57bcf1b0ad4 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/']
@@ -58,15 +54,15 @@
       ],
       'sources': [
         # All .cc, .h under views, except unittests
-        'accessibility/ax_aura_obj_cache.cc',
-        'accessibility/ax_aura_obj_cache.h',
-        'accessibility/ax_aura_obj_wrapper.h',
-        'accessibility/ax_view_obj_wrapper.cc',
-        'accessibility/ax_view_obj_wrapper.h',
-        'accessibility/ax_widget_obj_wrapper.cc',
-        'accessibility/ax_widget_obj_wrapper.h',
-        'accessibility/ax_window_obj_wrapper.cc',
-        'accessibility/ax_window_obj_wrapper.h',
+        # 'accessibility/ax_aura_obj_cache.cc',
+        # 'accessibility/ax_aura_obj_cache.h',
+        # 'accessibility/ax_aura_obj_wrapper.h',
+        # 'accessibility/ax_view_obj_wrapper.cc',
+        # 'accessibility/ax_view_obj_wrapper.h',
+        # 'accessibility/ax_widget_obj_wrapper.cc',
+        # 'accessibility/ax_widget_obj_wrapper.h',
+        # 'accessibility/ax_window_obj_wrapper.cc',
+        # 'accessibility/ax_window_obj_wrapper.h',
         'accessibility/native_view_accessibility.cc',
         'accessibility/native_view_accessibility.h',
         'accessibility/native_view_accessibility_win.cc',
@@ -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,9 @@
         '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_mac.cc',
         'controls/menu/menu_host.cc',
         'controls/menu/menu_host.h',
         'controls/menu/menu_host_root_view.cc',
@@ -167,7 +167,6 @@
         'controls/menu/menu_runner.cc',
         'controls/menu/menu_runner.h',
         'controls/menu/menu_runner_handler.h',
-        'controls/menu/menu_runner_mac.mm',
         'controls/menu/menu_scroll_view_container.cc',
         'controls/menu/menu_scroll_view_container.h',
         'controls/menu/menu_separator.h',
@@ -534,24 +533,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',