| Index: ui/aura/root_window.cc
|
| diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
|
| index 9c9bddebb8731c39e52dec1d56714fad2ca07004..bfc910998e4b32488bf501400a930352acfe9f5b 100644
|
| --- a/ui/aura/root_window.cc
|
| +++ b/ui/aura/root_window.cc
|
| @@ -15,7 +15,6 @@
|
| #include "ui/aura/aura_switches.h"
|
| #include "ui/aura/client/activation_client.h"
|
| #include "ui/aura/client/capture_client.h"
|
| -#include "ui/aura/client/drag_drop_client.h"
|
| #include "ui/aura/client/event_client.h"
|
| #include "ui/aura/client/screen_position_client.h"
|
| #include "ui/aura/display_manager.h"
|
| @@ -104,8 +103,6 @@ void CompositorLock::CancelLock() {
|
| root_window_ = NULL;
|
| }
|
|
|
| -bool RootWindow::hide_host_cursor_ = false;
|
| -
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // RootWindow, public:
|
|
|
| @@ -230,11 +227,6 @@ gfx::Point RootWindow::GetHostOrigin() const {
|
| }
|
|
|
| void RootWindow::SetCursor(gfx::NativeCursor cursor) {
|
| - // If a drag is in progress, the DragDropClient should override the cursor.
|
| - client::DragDropClient* dnd_client = client::GetDragDropClient(this);
|
| - if (dnd_client && dnd_client->IsDragDropInProgress())
|
| - cursor = dnd_client->GetDragCursor();
|
| -
|
| last_cursor_ = cursor;
|
| // A lot of code seems to depend on NULL cursors actually showing an arrow,
|
| // so just pass everything along to the host.
|
|
|