Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(614)

Unified Diff: ui/views/controls/menu/menu_host.cc

Issue 10910144: Get mouse events to work with win aura, and make the combobox function in the views examples app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_host.cc
===================================================================
--- ui/views/controls/menu/menu_host.cc (revision 156204)
+++ ui/views/controls/menu/menu_host.cc (working copy)
@@ -12,6 +12,11 @@
#include "ui/views/widget/native_widget_private.h"
#include "ui/views/widget/widget.h"
+#if defined(USE_AURA)
+#include "base/command_line.h"
+#include "ui/views/widget/desktop_native_widget_aura.h"
+#endif
+
namespace views {
////////////////////////////////////////////////////////////////////////////////
@@ -34,6 +39,10 @@
params.has_dropshadow = true;
params.parent_widget = parent;
params.bounds = bounds;
+#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+ if (CommandLine::ForCurrentProcess()->HasSwitch("win-aura"))
+ params.native_widget = new DesktopNativeWidgetAura(this);
+#endif
Init(params);
SetContentsView(contents_view);
ShowMenuHost(do_capture);
« no previous file with comments | « no previous file | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698