Migrate client API setters/getters to take a RootWindow.

http://crbug.com/112131
TEST=none
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/9455081

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123690 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 3 deletions

diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
index 9ff111c..d491621 100644
--- a/ash/drag_drop/drag_drop_controller.cc
+++ b/ash/drag_drop/drag_drop_controller.cc
@@ -42,7 +42,7 @@ DragDropController::DragDropController()
       drag_drop_in_progress_(false),
       should_block_during_drag_drop_(true) {
   Shell::GetInstance()->AddRootWindowEventFilter(this);
-  aura::client::SetDragDropClient(this);
+  aura::client::SetDragDropClient(Shell::GetRootWindow(), this);
 }
 
 DragDropController::~DragDropController() {
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
index a2a0d00..a17a485 100644
--- a/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -185,12 +185,13 @@ class DragDropControllerTest : public AshTestBase {
     AshTestBase::SetUp();
     drag_drop_controller_.reset(new TestDragDropController);
     drag_drop_controller_->set_should_block_during_drag_drop(false);
-    aura::client::SetDragDropClient(drag_drop_controller_.get());
+    aura::client::SetDragDropClient(Shell::GetRootWindow(),
+                                    drag_drop_controller_.get());
     views_delegate_.reset(new views::TestViewsDelegate);
   }
 
   void TearDown() OVERRIDE {
-    aura::client::SetDragDropClient(NULL);
+    aura::client::SetDragDropClient(Shell::GetRootWindow(), NULL);
     drag_drop_controller_.reset();
     AshTestBase::TearDown();
   }