Aura desktop: Show resize cursors again.

ui/views/widget/desktop_native_widget_helper_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_helper_aura.h"
 
 #include "ui/aura/client/dispatcher_client.h"
 #include "ui/aura/client/screen_position_client.h"
-#include "ui/aura/cursor_manager.h"
 #include "ui/aura/desktop/desktop_activation_client.h"
+#include "ui/aura/desktop/desktop_cursor_client.h"
 #include "ui/aura/desktop/desktop_dispatcher_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/shared/compound_event_filter.h"
 #include "ui/aura/shared/input_method_event_filter.h"
 #include "ui/aura/shared/root_window_capture_client.h"
 #include "ui/aura/window_property.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 #if defined(OS_WIN)
@@ skipping 97 matching lines @@
     return;
   }
 #endif
 
   gfx::Rect bounds = params.bounds;
   if (bounds.IsEmpty()) {
     // We must pass some non-zero value when we initialize a RootWindow. This
     // will probably be SetBounds()ed soon.
     bounds.set_size(gfx::Size(100, 100));
   }
-  // TODO(erg): Implement aura::CursorManager::Delegate to control
-  // cursor's shape and visibility.
 
   aura::FocusManager* focus_manager = NULL;
   aura::DesktopActivationClient* activation_client = NULL;
 #if defined(USE_X11)
   focus_manager = X11DesktopHandler::get()->get_focus_manager();
   activation_client = X11DesktopHandler::get()->get_activation_client();
 #else
   // TODO(ben): This is almost certainly wrong; I suspect that the windows
   // build will need a singleton like above.
   focus_manager = new aura::FocusManager;
@@ skipping 10 matching lines @@
   // Pass ownership of the filter to the root_window.
   root_window_->SetEventFilter(root_window_event_filter_);
 
   input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
   input_method_filter_->SetInputMethodPropertyInRootWindow(root_window_.get());
   root_window_event_filter_->AddFilter(input_method_filter_.get());
 
   capture_client_.reset(
       new aura::shared::RootWindowCaptureClient(root_window_.get()));
 
+  cursor_client_.reset(new aura::DesktopCursorClient(root_window_.get()));
+  aura::client::SetCursorClient(root_window_.get(), cursor_client_.get());
+
 #if defined(USE_X11)
   x11_window_event_filter_.reset(
       new X11WindowEventFilter(root_window_.get(), activation_client, widget_));
   x11_window_event_filter_->SetUseHostWindowBorders(false);
   root_window_event_filter_->AddFilter(x11_window_event_filter_.get());
 #endif
 
   root_window_->AddRootWindowObserver(this);
 
   aura::client::SetActivationClient(root_window_.get(), activation_client);
@@ skipping 56 matching lines @@
                                root->GetHostSize()));
 }
 
 void DesktopNativeWidgetHelperAura::OnRootWindowHostClosed(
     const aura::RootWindow* root) {
   DCHECK_EQ(root, root_window_.get());
   widget_->GetWidget()->Close();
 }
 
 }  // namespace views