diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 21:44:29 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 21:44:29 +0000 |
| commit | 50bde0387560560e711ca9ec376b0f7734ea5054 (patch) | |
| tree | f86cbfebbb14d200672737f1d49895b3974b7546 /views/controls | |
| parent | 31fd99b24c73754eac6e6417ce76ada710166b69 (diff) | |
| download | chromium_src-50bde0387560560e711ca9ec376b0f7734ea5054.zip chromium_src-50bde0387560560e711ca9ec376b0f7734ea5054.tar.gz chromium_src-50bde0387560560e711ca9ec376b0f7734ea5054.tar.bz2 | |
Revert 98306 - Create a new views_aura_desktop.
Get views::Widget rendering working against an aura::Window NativeWidget.
http://crbug.com/93944
TEST=none
Review URL: http://codereview.chromium.org/7741027
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/7749020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 7cfbb3a..a87b9ea 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -1748,12 +1748,7 @@ bool MenuController::SelectByChar(char16 character) { return false; } -#if defined(OS_WIN) -#if defined(USE_AURA) -void MenuController::RepostEvent(SubmenuView* source, - const MouseEvent& event) { -} -#else +#if defined(OS_WIN) && !defined(USE_AURA) void MenuController::RepostEvent(SubmenuView* source, const MouseEvent& event) { if (!state_.item) { @@ -1820,8 +1815,7 @@ void MenuController::RepostEvent(SubmenuView* source, } } } -#endif // !defined(USE_AURA) -#endif // defined(OS_WIN) +#endif void MenuController::SetDropMenuItem( MenuItemView* new_target, |