diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 21:24:25 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 21:24:25 +0000 |
| commit | 0e935c74fd6ca38866df63af66dc535497172950 (patch) | |
| tree | 675c767909ac2ac6f140d01407606db7193d591d /views/controls | |
| parent | bae2bd6410e24c06c64a304bb4be294e835bfb41 (diff) | |
| download | chromium_src-0e935c74fd6ca38866df63af66dc535497172950.zip chromium_src-0e935c74fd6ca38866df63af66dc535497172950.tar.gz chromium_src-0e935c74fd6ca38866df63af66dc535497172950.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index a87b9ea..7cfbb3a 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -1748,7 +1748,12 @@ bool MenuController::SelectByChar(char16 character) { return false; } -#if defined(OS_WIN) && !defined(USE_AURA) +#if defined(OS_WIN) +#if defined(USE_AURA) +void MenuController::RepostEvent(SubmenuView* source, + const MouseEvent& event) { +} +#else void MenuController::RepostEvent(SubmenuView* source, const MouseEvent& event) { if (!state_.item) { @@ -1815,7 +1820,8 @@ void MenuController::RepostEvent(SubmenuView* source, } } } -#endif +#endif // !defined(USE_AURA) +#endif // defined(OS_WIN) void MenuController::SetDropMenuItem( MenuItemView* new_target, |