diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 19:56:10 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 19:56:10 +0000 |
| commit | bb0830b9d30f3ff758717f5c2d5c4607248de2d2 (patch) | |
| tree | d8c696d07488ff155832872c1b9f9acdcaa01c21 /ui/views/views.gyp | |
| parent | ee2094805c4c9bb5402e12d5e8e4039dd0b8edff (diff) | |
| download | chromium_src-bb0830b9d30f3ff758717f5c2d5c4607248de2d2.zip chromium_src-bb0830b9d30f3ff758717f5c2d5c4607248de2d2.tar.gz chromium_src-bb0830b9d30f3ff758717f5c2d5c4607248de2d2.tar.bz2 | |
Revert 194356 "views: Finally get rid of the deprecated Menu2 API."
> views: Finally get rid of the deprecated Menu2 API.
>
> BUG=None
> TEST=None
> R=sky@chromium.org,msw@chromium.org
>
> Review URL: https://codereview.chromium.org/14150005
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/14320040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/views.gyp')
| -rw-r--r-- | ui/views/views.gyp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 6e36ae8..faf8275 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -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', |