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

trunk/src/ui/views/views.gyp

Index: trunk/src/ui/views/views.gyp
===================================================================
--- trunk/src/ui/views/views.gyp	(revision 195258)
+++ trunk/src/ui/views/views.gyp	(working copy)
@@ -112,6 +112,8 @@
         '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',
@@ -127,9 +129,6 @@
         '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',
@@ -145,8 +144,11 @@
         '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',
@@ -550,6 +552,9 @@
         }],
         ['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',