ozone: Remove CursorFactoryOzone::SetCursor, GetCursorWindow

ui/ozone/platform/dri/dri_window.cc

 // Copyright 2014 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/ozone/platform/dri/dri_window.h"
 
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/platform/platform_event_source.h"
+#include "ui/ozone/platform/dri/dri_cursor.h"
 #include "ui/ozone/platform/dri/dri_window_delegate.h"
 #include "ui/ozone/platform/dri/dri_window_manager.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
 DriWindow::DriWindow(PlatformWindowDelegate* delegate,
                      const gfx::Rect& bounds,
                      scoped_ptr<DriWindowDelegate> dri_window_delegate,
                      EventFactoryEvdev* event_factory,
-                     DriWindowManager* window_manager)
+                     DriWindowManager* window_manager,
+                     DriCursor* cursor)
     : delegate_(delegate),
       bounds_(bounds),
       widget_(dri_window_delegate->GetAcceleratedWidget()),
       dri_window_delegate_(dri_window_delegate.get()),
       event_factory_(event_factory),
-      window_manager_(window_manager) {
+      window_manager_(window_manager),
+      cursor_(cursor) {
   window_manager_->AddWindowDelegate(widget_, dri_window_delegate.Pass());
 }
 
 DriWindow::~DriWindow() {
   PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
   dri_window_delegate_->Shutdown();
   window_manager_->RemoveWindowDelegate(widget_);
 }
 
 void DriWindow::Initialize() {
@@ skipping 25 matching lines @@
 
 void DriWindow::ToggleFullscreen() {}
 
 void DriWindow::Maximize() {}
 
 void DriWindow::Minimize() {}
 
 void DriWindow::Restore() {}
 
 void DriWindow::SetCursor(PlatformCursor cursor) {
-  ui::CursorFactoryOzone::GetInstance()->SetCursor(widget_, cursor);
+  cursor_->SetCursor(widget_, cursor);
 }
 
 void DriWindow::MoveCursorTo(const gfx::Point& location) {
   event_factory_->WarpCursorTo(widget_, location);
 }
 
 bool DriWindow::CanDispatchEvent(const PlatformEvent& ne) {
   DCHECK(ne);
   Event* event = static_cast<Event*>(ne);
   if (event->IsMouseEvent() || event->IsScrollEvent())
-    return ui::CursorFactoryOzone::GetInstance()->GetCursorWindow() == widget_;
+    return cursor_->GetCursorWindow() == widget_;
 
   return true;
 }
 
 uint32_t DriWindow::DispatchEvent(const PlatformEvent& ne) {
   Event* event = static_cast<Event*>(ne);
   delegate_->DispatchEvent(event);
   return POST_DISPATCH_STOP_PROPAGATION;
 }
 
 }  // namespace ui