Plumb ClearNativeFocus to DesktopRootWindowHostWin.

Plumb ClearNativeFocus to DesktopRootWindowHostWin.

Get rid of FocusNativeView since it's only called in unittests now. Also removed from Widget.

Also, don't send non client mouse events to the RootWindowHostDelegate from DesktopRootWindowHostWin (RootWindowHostWin already does this). This fixes an assert when the message eventually gets to WebInputEventFactory, which doesn't handle non client messages.

BUG=146077
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=157638

[Ben Goodger (Google), 2012-09-19 18:10:04]

lgtm


On Wed, Sep 19, 2012 at 10:38 AM, <jam@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Plumb ClearNativeFocus to DesktopRootWindowHostWin.
>
> For FocusNativeView, I see that it's only being called in a unittest
> (focus_manager_unittest.cc). I don't know if this makes sense on desktop
> Aura.
> Do we still want this method, or should we take it out?
>
> Also, don't send non client mouse events to the RootWindowHostDelegate from
> DesktopRootWindowHostWin (RootWindowHostWin already does this). This fixes
> an
> assert when the message eventually gets to WebInputEventFactory, which
> doesn't
> handle non client messages.
>
> Please review this at
https://codereview.chromium.**org/10951033/<https://codereview.chromium.org/1...
>
> SVN Base: svn://chrome-svn/chrome/trunk/**src/
>
> Affected files:
>   M     ui/views/widget/desktop_**native_widget_aura.cc
>   M     ui/views/widget/desktop_root_**window_host.h
>   M     ui/views/widget/desktop_root_**window_host_linux.h
>   M     ui/views/widget/desktop_root_**window_host_linux.cc
>   M     ui/views/widget/desktop_root_**window_host_win.h
>   M     ui/views/widget/desktop_root_**window_host_win.cc
>
>
> Index: ui/views/widget/desktop_**native_widget_aura.cc
> ==============================**==============================**=======
> --- ui/views/widget/desktop_**native_widget_aura.cc       (revision
> 157553)
> +++ ui/views/widget/desktop_**native_widget_aura.cc       (working copy)
> @@ -302,9 +302,11 @@
>  }
>
>  void DesktopNativeWidgetAura::**ClearNativeFocus() {
> +  desktop_root_window_host_->**ClearNativeFocus();
>  }
>
>  void DesktopNativeWidgetAura::**FocusNativeView(gfx::**NativeView
> native_view) {
> +  desktop_root_window_host_->**FocusNativeView(native_view);
>  }
>
>  gfx::Rect DesktopNativeWidgetAura::**GetWorkAreaBoundsInScreen() const {
> Index: ui/views/widget/desktop_root_**window_host.h
> ==============================**==============================**=======
> --- ui/views/widget/desktop_root_**window_host.h  (revision 157553)
> +++ ui/views/widget/desktop_root_**window_host.h  (working copy)
> @@ -73,6 +73,9 @@
>    virtual internal::InputMethodDelegate* GetInputMethodDelegate() = 0;
>
>    virtual void SetWindowTitle(const string16& title) = 0;
> +
> +  virtual void ClearNativeFocus() = 0;
> +  virtual void FocusNativeView(gfx::**NativeView native_view) = 0;
>  };
>
>  }  // namespace views
> Index: ui/views/widget/desktop_root_**window_host_linux.cc
> ==============================**==============================**=======
> --- ui/views/widget/desktop_root_**window_host_linux.cc   (revision
> 157553)
> +++ ui/views/widget/desktop_root_**window_host_linux.cc   (working copy)
> @@ -347,6 +347,16 @@
>    NOTIMPLEMENTED();
>  }
>
> +void DesktopRootWindowHostLinux::**ClearNativeFocus() {
> +  // TODO(erg):
> +  NOTIMPLEMENTED();
> +}
> +
> +void DesktopRootWindowHostLinux::**FocusNativeView(gfx::**NativeView
> native_view) {
> +  // TODO(erg):
> +  NOTIMPLEMENTED();
> +}
> +
>  //////////////////////////////**//////////////////////////////**
> ////////////////////
>  // DesktopRootWindowHostLinux, aura::RootWindowHost implementation:
>
> Index: ui/views/widget/desktop_root_**window_host_linux.h
> ==============================**==============================**=======
> --- ui/views/widget/desktop_root_**window_host_linux.h    (revision
> 157553)
> +++ ui/views/widget/desktop_root_**window_host_linux.h    (working copy)
> @@ -84,6 +84,8 @@
>    virtual InputMethod* CreateInputMethod() OVERRIDE;
>    virtual internal::InputMethodDelegate* GetInputMethodDelegate()
> OVERRIDE;
>    virtual void SetWindowTitle(const string16& title) OVERRIDE;
> +  virtual void ClearNativeFocus() OVERRIDE;
> +  virtual void FocusNativeView(gfx::**NativeView native_view) OVERRIDE;
>
>    // Overridden from aura::RootWindowHost:
>    virtual aura::RootWindow* GetRootWindow() OVERRIDE;
> Index: ui/views/widget/desktop_root_**window_host_win.cc
> ==============================**==============================**=======
> --- ui/views/widget/desktop_root_**window_host_win.cc     (revision
> 157553)
> +++ ui/views/widget/desktop_root_**window_host_win.cc     (working copy)
> @@ -206,6 +206,13 @@
>    message_handler_->SetTitle(**title);
>  }
>
> +void DesktopRootWindowHostWin::**ClearNativeFocus() {
> +  message_handler_->**ClearNativeFocus();
> +}
> +
> +void DesktopRootWindowHostWin::**FocusNativeView(gfx::**NativeView
> native_view) {
> +}
> +
>  //////////////////////////////**//////////////////////////////**
> ////////////////////
>  // DesktopRootWindowHostWin, RootWindowHost implementation:
>
> @@ -510,6 +517,8 @@
>  }
>
>  bool DesktopRootWindowHostWin::**HandleMouseEvent(const ui::MouseEvent&
> event) {
> +  if (event.flags() & ui::EF_IS_NON_CLIENT)
> +    return false;
>    return root_window_host_delegate_->**OnHostMouseEvent(
>        const_cast<ui::MouseEvent*>(&**event));
>  }
> Index: ui/views/widget/desktop_root_**window_host_win.h
> ==============================**==============================**=======
> --- ui/views/widget/desktop_root_**window_host_win.h      (revision
> 157553)
> +++ ui/views/widget/desktop_root_**window_host_win.h      (working copy)
> @@ -66,6 +66,8 @@
>    virtual InputMethod* CreateInputMethod() OVERRIDE;
>    virtual internal::InputMethodDelegate* GetInputMethodDelegate()
> OVERRIDE;
>    virtual void SetWindowTitle(const string16& title) OVERRIDE;
> +  virtual void ClearNativeFocus() OVERRIDE;
> +  virtual void FocusNativeView(gfx::**NativeView native_view) OVERRIDE;
>
>    // Overridden from aura::RootWindowHost:
>    virtual aura::RootWindow* GetRootWindow() OVERRIDE;
>
>
>

[jam, 2012-09-19 21:28:36]

ptal, removed FocusNativeView

[Ben Goodger (Google), 2012-09-19 21:31:18]

lgtm