MacViews: Replace NativeWidget::GetEventHandler() with RepostNativeEvent(..)

This removes an aura dependency in webview/web_dialog_view.cc and is a
step towards getting the views_examples target compiling on Mac.

NativeWidget::GetEventHandler isn't used elsewhere.

Pre-Aura Win would use ::DefWindowProc() in
WebDialogView::HandleKeyboardEvent(), so NativeWidget feels like the
right place for this.

BUG=366007
TEST=Just refactoring

Review URL: https://codereview.chromium.org/307623002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273793 0039d316-1c4b-4281-b951-d872f2087c98

ui/views/controls/webview/web_dialog_view.cc

@@ -18,7 +18,7 @@
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
-#include "ui/views/widget/native_widget_aura.h"
+#include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
@@ -280,14 +280,8 @@ void WebDialogView::HandleKeyboardEvent(content::WebContents* source,
                                         const NativeWebKeyboardEvent& event) {
   if (!event.os_event)
     return;
-  ui::KeyEvent aura_event(event.os_event->native_event(), false);
-  ui::EventHandler* event_handler =
-      GetWidget()->native_widget()->GetEventHandler();
-
-  DCHECK(event_handler);
-  if (event_handler)
-    event_handler->OnKeyEvent(&aura_event);
 
+  GetWidget()->native_widget_private()->RepostNativeEvent(event.os_event);
 }
 
 void WebDialogView::CloseContents(WebContents* source) {

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

@@ -932,6 +932,10 @@ void DesktopNativeWidgetAura::OnRootViewLayout() const {
     desktop_window_tree_host_->OnRootViewLayout();
 }
 
+void DesktopNativeWidgetAura::RepostNativeEvent(gfx::NativeEvent native_event) {
+  OnEvent(native_event);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, aura::WindowDelegate implementation:
 
@@ -1178,11 +1182,7 @@ void DesktopNativeWidgetAura::OnHostMoved(const aura::WindowTreeHost* host,
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// DesktopNativeWidgetAura, NativeWidget implementation:
-
-ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() {
-  return this;
-}
+// DesktopNativeWidgetAura, private:
 
 void DesktopNativeWidgetAura::InstallInputMethodEventFilter() {
   DCHECK(!input_method_event_filter_.get());

ui/views/widget/desktop_aura/desktop_native_widget_aura.h

@@ -89,9 +89,6 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
     return host_.get();
   }
 
-  // Overridden from NativeWidget:
-  virtual ui::EventHandler* GetEventHandler() OVERRIDE;
-
   // Ensures that the correct window is activated/deactivated based on whether
   // we are being activated/deactivated.
   void HandleActivationChanged(bool active);
@@ -181,6 +178,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
   virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE;
   virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE;
   virtual void OnRootViewLayout() const OVERRIDE;
+  virtual void RepostNativeEvent(gfx::NativeEvent native_event) OVERRIDE;
 
   // Overridden from aura::WindowDelegate:
   virtual gfx::Size GetMinimumSize() const OVERRIDE;

ui/views/widget/native_widget.h

@@ -7,10 +7,6 @@
 
 #include "ui/views/widget/widget.h"
 
-namespace ui {
-class EventHandler;
-}
-
 namespace views {
 namespace internal {
 class NativeWidgetPrivate;
@@ -30,9 +26,6 @@ class VIEWS_EXPORT NativeWidget {
  public:
   virtual ~NativeWidget() {}
 
-  // Retrieves the event handler
-  virtual ui::EventHandler* GetEventHandler() = 0;
-
  private:
   friend class Widget;
 

ui/views/widget/native_widget_aura.cc

@@ -691,6 +691,10 @@ ui::NativeTheme* NativeWidgetAura::GetNativeTheme() const {
 void NativeWidgetAura::OnRootViewLayout() const {
 }
 
+void NativeWidgetAura::RepostNativeEvent(gfx::NativeEvent native_event) {
+  OnEvent(native_event);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, views::InputMethodDelegate implementation:
 
@@ -948,13 +952,6 @@ int NativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
       last_drop_operation_);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NativeWidgetAura, NativeWidget implementation:
-
-ui::EventHandler* NativeWidgetAura::GetEventHandler() {
-  return this;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, protected:
 

ui/views/widget/native_widget_aura.h

@@ -132,6 +132,7 @@ class VIEWS_EXPORT NativeWidgetAura
   virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE;
   virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE;
   virtual void OnRootViewLayout() const OVERRIDE;
+  virtual void RepostNativeEvent(gfx::NativeEvent native_event) OVERRIDE;
 
   // Overridden from views::InputMethodDelegate:
   virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE;
@@ -179,9 +180,6 @@ class VIEWS_EXPORT NativeWidgetAura
   virtual void OnDragExited() OVERRIDE;
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
 
-  // Overridden from NativeWidget:
-  virtual ui::EventHandler* GetEventHandler() OVERRIDE;
-
  protected:
   virtual ~NativeWidgetAura();
 

ui/views/widget/native_widget_mac.h

@@ -101,9 +101,7 @@ class VIEWS_EXPORT NativeWidgetMac : public internal::NativeWidgetPrivate {
   virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE;
   virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE;
   virtual void OnRootViewLayout() const OVERRIDE;
-
-  // NativeWidget:
-  virtual ui::EventHandler* GetEventHandler() OVERRIDE;
+  virtual void RepostNativeEvent(gfx::NativeEvent native_event) OVERRIDE;
 
  private:
   internal::NativeWidgetDelegate* delegate_;

ui/views/widget/native_widget_mac.mm

@@ -355,11 +355,8 @@ void NativeWidgetMac::OnRootViewLayout() const {
   NOTIMPLEMENTED();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NativeWidgetMac, NativeWidget implementation:
-
-ui::EventHandler* NativeWidgetMac::GetEventHandler() {
-  return NULL;
+void NativeWidgetMac::RepostNativeEvent(gfx::NativeEvent native_event) {
+  NOTIMPLEMENTED();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

ui/views/widget/native_widget_private.h

@@ -228,9 +228,11 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget {
   virtual ui::NativeTheme* GetNativeTheme() const = 0;
   virtual void OnRootViewLayout() const = 0;
 
+  // Repost an unhandled event to the native widget for default OS processing.
+  virtual void RepostNativeEvent(gfx::NativeEvent native_event) = 0;
+
   // Overridden from NativeWidget:
   virtual internal::NativeWidgetPrivate* AsNativeWidgetPrivate() OVERRIDE;
-  virtual ui::EventHandler* GetEventHandler() = 0;
 };
 
 }  // namespace internal