Revert 194356 "views: Finally get rid of the deprecated Menu2 API."

trunk/src/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', {
@@ skipping 94 matching lines @@
         '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/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_views.cc',
         'controls/menu/menu_config_win.cc',
         'controls/menu/menu_controller.cc',
         'controls/menu/menu_controller.h',
         'controls/menu/menu_controller_aura.cc',
         'controls/menu/menu_controller_delegate.h',
         'controls/menu/menu_controller_win.cc',
         'controls/menu/menu_delegate.cc',
         'controls/menu/menu_delegate.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_image_util.cc',
-        'controls/menu/menu_image_util.h',
-        'controls/menu/menu_insertion_delegate.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_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_win.cc',
         'controls/menu/menu_win.h',
+        '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',
         'controls/menu/submenu_view.cc',
         'controls/menu/submenu_view.h',
         'controls/message_box_view.cc',
         'controls/message_box_view.h',
         'controls/native_control.cc',
         'controls/native_control.h',
         'controls/native_control_win.cc',
         'controls/native_control_win.h',
         'controls/native/native_view_host.cc',
         'controls/native/native_view_host.h',
@@ skipping 383 matching lines @@
           'msvs_disabled_warnings': [ 4267, ],
         }],
         ['use_aura==0 or OS!="win"', {
           'sources!': [
             'widget/widget_message_filter.cc',
             'widget/widget_message_filter.h',
           ],
         }],
         ['OS!="win"', {
           'sources!': [
+            'controls/menu/menu_wrapper.h',
+            'controls/menu/menu_2.cc',
+            'controls/menu/menu_2.h',
             'win/fullscreen_handler.cc',
             'win/fullscreen_handler.h',
             'win/hwnd_message_handler.cc',
             'win/hwnd_message_handler.h',
             'win/hwnd_message_handler_delegate.h',
             'win/scoped_fullscreen_visibility.cc',
             'win/scoped_fullscreen_visibility.h',
             'widget/widget_hwnd_utils.cc',
             'widget/widget_hwnd_utils.h',
           ],
@@ skipping 440 matching lines @@
           'sources/': [
             # This is needed because the aura rule strips it from the default
             # sources list.
             ['include', '^../../content/app/startup_helper_win.cc'],
           ],
         }],
       ],
     },  # target_name: views_examples_with_content_exe
   ],
 }