Refactor menu controller to isolate aura dependency.

ui/views/views.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'conditions': [
       ['use_aura==1', {
         'dependencies': [
           '../aura/aura.gyp:aura',
           '../wm/wm.gyp:wm',
         ],
       }, {
         'sources/': [
-          ['exclude', '^controls/combobox/'],
           ['exclude', '^controls/native/'],
-          ['exclude', '^controls/scrollbar/'],
-          ['exclude', '^controls/table/'],
-          ['exclude', '^controls/tree/'],
           ['exclude', '^corewm/'],
           ['exclude', '^touchui/'],
           ['exclude', '^widget/desktop_aura/']
         ]
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'views',
@@ skipping 19 matching lines @@
         '../resources/ui_resources.gyp:ui_resources',
       ],
       'export_dependent_settings': [
         '../accessibility/accessibility.gyp:ax_gen',
       ],
       'defines': [
         'VIEWS_IMPLEMENTATION',
       ],
       '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',
         'accessibility/native_view_accessibility_win.h',
         'accessible_pane_view.cc',
         'accessible_pane_view.h',
         'animation/bounds_animator.cc',
         'animation/bounds_animator.h',
         'animation/scroll_animator.cc',
         'animation/scroll_animator.h',
@@ skipping 48 matching lines @@
         'controls/glow_hover_controller.cc',
         'controls/glow_hover_controller.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/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',
         '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_mac.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_event_dispatcher_linux.cc',
         'controls/menu/menu_event_dispatcher_linux.h',
         'controls/menu/menu_delegate.cc',
         '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',
         'controls/menu/menu_host_root_view.h',
         'controls/menu/menu_insertion_delegate_win.h',
         'controls/menu/menu_item_view.cc',
         'controls/menu/menu_item_view.h',
         'controls/menu/menu_listener.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_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',
         'controls/menu/menu_separator_views.cc',
         'controls/menu/menu_separator_win.cc',
         'controls/menu/menu_wrapper.h',
         'controls/menu/native_menu_win.cc',
         'controls/menu/native_menu_win.h',
         'controls/menu/menu_image_util.cc',
         'controls/menu/menu_image_util.h',
@@ skipping 346 matching lines @@
         ['use_x11==1', {
           'dependencies': [
             '../../build/linux/system.gyp:x11',
             '../../build/linux/system.gyp:xrandr',
           ],
         }],
         ['use_aura==0', {
           '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',
             'widget/window_reorderer.h',
           ],
         }],
       ],
     }, # target_name: views
     {
       'target_name': 'views_test_support',
@@ skipping 189 matching lines @@
         }],
         ['use_aura==1', {
           'dependencies': [
             '../aura/aura.gyp:aura_test_support',
           ],
         }],
       ],
     },  # target_name: views_unittests
   ],
 }