Rename Desktop->RootWindow.

ui/aura_shell/drag_drop_controller_unittest.cc

 // Copyright (c) 2011 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/aura_shell/drag_drop_controller.h"
 
 #include "base/location.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
-#include "ui/aura_shell/desktop_event_filter.h"
+#include "ui/aura/root_window.h"
+#include "ui/aura_shell/root_window_event_filter.h"
 #include "ui/aura_shell/test/aura_shell_test_base.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/views/events/event.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace aura_shell {
 namespace test {
 
@@ skipping 116 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestDragDropController);
 };
 
 views::Widget* CreateNewWidget() {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.accept_events = true;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.parent = aura::Desktop::GetInstance();
+  params.parent = aura::RootWindow::GetInstance();
   params.child = true;
   widget->Init(params);
   widget->Show();
   return widget;
 }
 
 void AddViewToWidgetAndResize(views::Widget* widget, views::View* view) {
   if (!widget->GetContentsView()) {
     views::View* contents_view = new views::View;
     widget->SetContentsView(contents_view);
   }
 
   views::View* contents_view = widget->GetContentsView();
   contents_view->AddChildView(view);
   view->SetBounds(contents_view->width(), 0, 100, 100);
   gfx::Rect contents_view_bounds = contents_view->bounds();
   contents_view_bounds = contents_view_bounds.Union(view->bounds());
   contents_view->SetBoundsRect(contents_view_bounds);
   widget->SetBounds(contents_view_bounds);
 }
 
 }  // namespace
 
 class DragDropControllerTest : public AuraShellTestBase {
  public:
   DragDropControllerTest() : AuraShellTestBase() {
   }
 
   virtual ~DragDropControllerTest() {
-    aura::Desktop::GetInstance()->SetProperty(aura::kDesktopDragDropClientKey,
+    aura::RootWindow::GetInstance()->SetProperty(
+        aura::kRootWindowDragDropClientKey,
         NULL);
   }
 
   void SetUp() OVERRIDE {
     AuraShellTestBase::SetUp();
     drag_drop_controller_ = new TestDragDropController;
     drag_drop_controller_->set_should_block_during_drag_drop(false);
-    aura::Desktop::GetInstance()->SetProperty(aura::kDesktopDragDropClientKey,
+    aura::RootWindow::GetInstance()->SetProperty(
+        aura::kRootWindowDragDropClientKey,
         drag_drop_controller_);
   }
 
   void TearDown() OVERRIDE {
     delete drag_drop_controller_;
     drag_drop_controller_ = NULL;
     AuraShellTestBase::TearDown();
   }
 
   void UpdateDragData(ui::OSExchangeData* data) {
     drag_drop_controller_->drag_data_ = data;
   }
 
  protected:
   TestDragDropController* drag_drop_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DragDropControllerTest);
 };
 
 TEST_F(DragDropControllerTest, DragDropInSingleViewTest) {
   views::Widget* widget = CreateNewWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget, drag_view);
   gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint();
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
   aura::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_BUTTON_DOWN);
-  aura::Desktop::GetInstance()->DispatchMouseEvent(&event1);
+  aura::RootWindow::GetInstance()->DispatchMouseEvent(&event1);
 
   int num_drags = 17;
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
     point.Offset(0, 1);
     aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
         ui::EF_LEFT_BUTTON_DOWN);
-    aura::Desktop::GetInstance()->DispatchMouseEvent(&drag_event);
+    aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
   aura::MouseEvent event2(ui::ET_MOUSE_RELEASED, point, 0);
-  aura::Desktop::GetInstance()->DispatchMouseEvent(&event2);
+  aura::RootWindow::GetInstance()->DispatchMouseEvent(&event2);
 
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
       drag_drop_controller_->num_drag_updates_);
   EXPECT_TRUE(drag_drop_controller_->drop_received_);
   EXPECT_EQ(UTF8ToUTF16("I am being dragged"),
       drag_drop_controller_->drag_string_);
 
   EXPECT_EQ(1, drag_view->num_drag_enters_);
   EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
       drag_view->num_drag_updates_);
   EXPECT_EQ(1, drag_view->num_drops_);
   EXPECT_EQ(0, drag_view->num_drag_exits_);
   EXPECT_TRUE(drag_view->drag_done_received_);
   delete widget;
 }
 
 TEST_F(DragDropControllerTest, DragDropInMultipleViewsSingleWidgetTest) {
   views::Widget* widget = CreateNewWidget();
   DragTestView* drag_view1 = new DragTestView;
   AddViewToWidgetAndResize(widget, drag_view1);
   gfx::Point point = drag_view1->bounds().CenterPoint();
   DragTestView* drag_view2 = new DragTestView;
   AddViewToWidgetAndResize(widget, drag_view2);
 
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
   aura::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_BUTTON_DOWN);
-  aura::Desktop::GetInstance()->DispatchMouseEvent(&event1);
+  aura::RootWindow::GetInstance()->DispatchMouseEvent(&event1);
 
   int num_drags = drag_view1->width();
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
     point.Offset(1, 0);
     aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
         ui::EF_LEFT_BUTTON_DOWN);
-    aura::Desktop::GetInstance()->DispatchMouseEvent(&drag_event);
+    aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
   aura::MouseEvent event2(ui::ET_MOUSE_RELEASED, point, 0);
-  aura::Desktop::GetInstance()->DispatchMouseEvent(&event2);
+  aura::RootWindow::GetInstance()->DispatchMouseEvent(&event2);
 
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_EQ(num_drags - 1 - drag_view1->HorizontalDragThreshold(),
       drag_drop_controller_->num_drag_updates_);
   EXPECT_TRUE(drag_drop_controller_->drop_received_);
   EXPECT_EQ(UTF8ToUTF16("I am being dragged"),
       drag_drop_controller_->drag_string_);
 
   EXPECT_EQ(1, drag_view1->num_drag_enters_);
   int num_expected_updates = drag_view1->bounds().width() -
@@ skipping 23 matching lines @@
   AddViewToWidgetAndResize(widget2, drag_view2);
   gfx::Rect widget1_bounds = widget1->GetClientAreaScreenBounds();
   gfx::Rect widget2_bounds = widget2->GetClientAreaScreenBounds();
   widget2->SetBounds(gfx::Rect(widget1_bounds.width(), 0,
       widget2_bounds.width(), widget2_bounds.height()));
 
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
   aura::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_BUTTON_DOWN);
-  aura::Desktop::GetInstance()->DispatchMouseEvent(&event1);
+  aura::RootWindow::GetInstance()->DispatchMouseEvent(&event1);
 
   int num_drags = drag_view1->width();
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
     point.Offset(1, 0);
     aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
         ui::EF_LEFT_BUTTON_DOWN);
-    aura::Desktop::GetInstance()->DispatchMouseEvent(&drag_event);
+    aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
   aura::MouseEvent event2(ui::ET_MOUSE_RELEASED, point, 0);
-  aura::Desktop::GetInstance()->DispatchMouseEvent(&event2);
+  aura::RootWindow::GetInstance()->DispatchMouseEvent(&event2);
 
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_EQ(num_drags - 1 - drag_view1->HorizontalDragThreshold(),
       drag_drop_controller_->num_drag_updates_);
   EXPECT_TRUE(drag_drop_controller_->drop_received_);
   EXPECT_EQ(UTF8ToUTF16("I am being dragged"),
       drag_drop_controller_->drag_string_);
 
   EXPECT_EQ(1, drag_view1->num_drag_enters_);
   int num_expected_updates = drag_view1->bounds().width() -
@@ skipping 16 matching lines @@
 
 TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) {
   views::Widget* widget = CreateNewWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget, drag_view);
   gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint();
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
   aura::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_BUTTON_DOWN);
-  aura::Desktop::GetInstance()->DispatchMouseEvent(&event1);
+  aura::RootWindow::GetInstance()->DispatchMouseEvent(&event1);
 
   int num_drags_1 = 17;
   for (int i = 0; i < num_drags_1; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
     point.Offset(0, 1);
     aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
         ui::EF_LEFT_BUTTON_DOWN);
-    aura::Desktop::GetInstance()->DispatchMouseEvent(&drag_event);
+    aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
   drag_view->parent()->RemoveChildView(drag_view);
   // View has been removed. We will not get any of the following drag updates.
   int num_drags_2 = 23;
   for (int i = 0; i < num_drags_2; ++i) {
     UpdateDragData(&data);
     point.Offset(0, 1);
     aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
         ui::EF_LEFT_BUTTON_DOWN);
-    aura::Desktop::GetInstance()->DispatchMouseEvent(&drag_event);
+    aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
   aura::MouseEvent event2(ui::ET_MOUSE_RELEASED, point, 0);
-  aura::Desktop::GetInstance()->DispatchMouseEvent(&event2);
+  aura::RootWindow::GetInstance()->DispatchMouseEvent(&event2);
 
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_EQ(num_drags_1 + num_drags_2 - 1 - drag_view->VerticalDragThreshold(),
       drag_drop_controller_->num_drag_updates_);
   EXPECT_TRUE(drag_drop_controller_->drop_received_);
   EXPECT_EQ(UTF8ToUTF16("I am being dragged"),
       drag_drop_controller_->drag_string_);
 
   EXPECT_EQ(1, drag_view->num_drag_enters_);
   EXPECT_EQ(num_drags_1 - 1 - drag_view->VerticalDragThreshold(),
       drag_view->num_drag_updates_);
   EXPECT_EQ(0, drag_view->num_drops_);
   EXPECT_EQ(0, drag_view->num_drag_exits_);
   EXPECT_TRUE(drag_view->drag_done_received_);
   delete widget;
 }
 
 }  // namespace test
 }  // namespace aura