Get mouse events to work with win aura, and make the combobox function in the views examples app.

ui/views/widget/desktop_native_widget_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_native_widget_aura.h"
 
+#include "ui/aura/root_window_host.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
+#include "ui/compositor/layer.h"
 #include "ui/views/widget/desktop_root_window_host.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, public:
 
 DesktopNativeWidgetAura::DesktopNativeWidgetAura(
     internal::NativeWidgetDelegate* delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
@@ skipping 42 matching lines @@
 
 gfx::NativeWindow DesktopNativeWidgetAura::GetNativeWindow() const {
   return window_;
 }
 
 Widget* DesktopNativeWidgetAura::GetTopLevelWidget() {
   return GetWidget();
 }
 
 const ui::Compositor* DesktopNativeWidgetAura::GetCompositor() const {
-  return NULL;
+  return window_->layer()->GetCompositor();
 }
 
 ui::Compositor* DesktopNativeWidgetAura::GetCompositor() {
-  return NULL;
+  return window_->layer()->GetCompositor();
 }
 
 void DesktopNativeWidgetAura::CalculateOffsetToAncestorWithLayer(
       gfx::Point* offset,
       ui::Layer** layer_parent) {
 }
 
 void DesktopNativeWidgetAura::ViewRemoved(View* view) {
 }
 
@@ skipping 64 matching lines @@
 }
 
 void DesktopNativeWidgetAura::InitModalType(ui::ModalType modal_type) {
 }
 
 gfx::Rect DesktopNativeWidgetAura::GetWindowBoundsInScreen() const {
   return gfx::Rect(100, 100);
 }
 
 gfx::Rect DesktopNativeWidgetAura::GetClientAreaBoundsInScreen() const {
-  return gfx::Rect(100, 100);
+  return desktop_root_window_host_->GetClientAreaBoundsInScreen();
 }
 
 gfx::Rect DesktopNativeWidgetAura::GetRestoredBounds() const {
   return gfx::Rect(100, 100);
 }
 
 void DesktopNativeWidgetAura::SetBounds(const gfx::Rect& bounds) {
 }
 
 void DesktopNativeWidgetAura::SetSize(const gfx::Size& size) {
 }
 
 void DesktopNativeWidgetAura::StackAbove(gfx::NativeView native_view) {
 }
 
 void DesktopNativeWidgetAura::StackAtTop() {
 }
 
 void DesktopNativeWidgetAura::StackBelow(gfx::NativeView native_view) {
 }
 
 void DesktopNativeWidgetAura::SetShape(gfx::NativeRegion shape) {
 }
 
 void DesktopNativeWidgetAura::Close() {
+  desktop_root_window_host_->Close();
 }
 
 void DesktopNativeWidgetAura::CloseNow() {
+  desktop_root_window_host_->CloseNow();
 }
 
 void DesktopNativeWidgetAura::Show() {
+  desktop_root_window_host_->AsRootWindowHost()->Show();
 }
 
 void DesktopNativeWidgetAura::Hide() {
+  desktop_root_window_host_->AsRootWindowHost()->Hide();
 }
 
 void DesktopNativeWidgetAura::ShowMaximizedWithBounds(
       const gfx::Rect& restored_bounds) {
 }
 
 void DesktopNativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
   desktop_root_window_host_->ShowWindowWithState(state);
 }
 
 bool DesktopNativeWidgetAura::IsVisible() const {
-  return false;
+  return desktop_root_window_host_->IsVisible();
 }
 
 void DesktopNativeWidgetAura::Activate() {
 }
 
 void DesktopNativeWidgetAura::Deactivate() {
 }
 
 bool DesktopNativeWidgetAura::IsActive() const {
   return true;
@@ skipping 39 matching lines @@
   return false;
 }
 
 void DesktopNativeWidgetAura::RunShellDrag(View* view,
                             const ui::OSExchangeData& data,
                             const gfx::Point& location,
                             int operation) {
 }
 
 void DesktopNativeWidgetAura::SchedulePaintInRect(const gfx::Rect& rect) {
+  if (window_)
+    window_->SchedulePaintInRect(rect);
 }
 
 void DesktopNativeWidgetAura::SetCursor(gfx::NativeCursor cursor) {
 }
 
 void DesktopNativeWidgetAura::ClearNativeFocus() {
 }
 
 void DesktopNativeWidgetAura::FocusNativeView(gfx::NativeView native_view) {
 }
@@ skipping 86 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, ui::EventHandler implementation:
 
 ui::EventResult DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
 ui::EventResult DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
-  return ui::ER_UNHANDLED;
+  DCHECK(window_->IsVisible());
+  if (event->type() == ui::ET_MOUSEWHEEL) {
+    return native_widget_delegate_->OnMouseEvent(*event) ?

[Peter Kasting, 2012/09/07 22:32:15]

Random drive-by nit: Can these delegate functions be made to return EventResult
values directly?

+        ui::ER_HANDLED : ui::ER_UNHANDLED;
+  }
+
+  if (event->type() == ui::ET_SCROLL) {
+    if (native_widget_delegate_->OnMouseEvent(*event))
+      return ui::ER_HANDLED;
+
+    // Convert unprocessed scroll events into wheel events.
+    ui::MouseWheelEvent mwe(*static_cast<ui::ScrollEvent*>(event));
+    return native_widget_delegate_->OnMouseEvent(mwe) ?
+        ui::ER_HANDLED : ui::ER_UNHANDLED;
+  }
+  return native_widget_delegate_->OnMouseEvent(*event) ?
+      ui::ER_HANDLED : ui::ER_UNHANDLED;
 }
 
 ui::TouchStatus DesktopNativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ui::EventResult DesktopNativeWidgetAura::OnGestureEvent(
     ui::GestureEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
 }  // namespace views