| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| index e619661efa63c444714b97c15e8dcfdca1ede312..f7f835b0df57cfa3685df70cfcc96e71b32a89b7 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| @@ -259,6 +259,7 @@ DesktopNativeWidgetAura::DesktopNativeWidgetAura(
|
| widget_type_(Widget::InitParams::TYPE_WINDOW) {
|
| aura::client::SetFocusChangeObserver(content_window_, this);
|
| aura::client::SetActivationChangeObserver(content_window_, this);
|
| + wm::SetCursorDelegate(content_window_, this);
|
| }
|
|
|
| DesktopNativeWidgetAura::~DesktopNativeWidgetAura() {
|
| @@ -929,10 +930,6 @@ gfx::Size DesktopNativeWidgetAura::GetMaximumSize() const {
|
| return native_widget_delegate_->GetMaximumSize();
|
| }
|
|
|
| -gfx::NativeCursor DesktopNativeWidgetAura::GetCursor(const gfx::Point& point) {
|
| - return cursor_;
|
| -}
|
| -
|
| int DesktopNativeWidgetAura::GetNonClientComponent(
|
| const gfx::Point& point) const {
|
| return native_widget_delegate_->GetNonClientComponent(point);
|
| @@ -1163,6 +1160,14 @@ void DesktopNativeWidgetAura::OnHostMoved(const aura::WindowTreeHost* host,
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| +// DesktopNativeWidgetAura, wm::CursorDelegate implementation:
|
| +
|
| +gfx::NativeCursor DesktopNativeWidgetAura::GetCursorForPoint(
|
| + const gfx::Point& point) {
|
| + return cursor_;
|
| +}
|
| +
|
| +////////////////////////////////////////////////////////////////////////////////
|
| // DesktopNativeWidgetAura, NativeWidget implementation:
|
|
|
| ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() {
|
|
|