Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again.

R=sky@chromium.org
http://crbug.com/308843

Review URL: https://codereview.chromium.org/72503002

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

7 files changed, 52 insertions, 48 deletions

diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index 2204ac2..ee5d25a 100644
--- a/ash/display/display_controller.cc
+++ b/ash/display/display_controller.cc
@@ -114,7 +114,7 @@ void SetDisplayPropertiesOnHostWindow(aura::RootWindow* root,
   }
 
   int internal = display.IsInternal() ? 1 : 0;
-  gfx::AcceleratedWidget xwindow = root->GetAcceleratedWidget();
+  gfx::AcceleratedWidget xwindow = root->host()->GetAcceleratedWidget();
   ui::SetIntProperty(xwindow, kInternalProp, kCARDINAL, internal);
   ui::SetIntProperty(xwindow, kRotationProp, kCARDINAL, xrandr_rotation);
   ui::SetIntProperty(xwindow,
@@ -525,13 +525,13 @@ void DisplayController::EnsurePointerInDisplays() {
       aura::client::ScreenPositionClient* client =
           aura::client::GetScreenPositionClient(root_window);
       client->ConvertPointFromScreen(root_window, &center);
-      root_window->GetDispatcher()->ConvertPointToNativeScreen(&center);
+      root_window->GetDispatcher()->host()->ConvertPointToNativeScreen(&center);
       dst_root_window = root_window;
       target_location_in_native = center;
       closest_distance_squared = distance_squared;
     }
   }
-  dst_root_window->GetDispatcher()->ConvertPointFromNativeScreen(
+  dst_root_window->GetDispatcher()->host()->ConvertPointFromNativeScreen(
       &target_location_in_native);
   dst_root_window->MoveCursorTo(target_location_in_native);
 }
@@ -676,7 +676,7 @@ void DisplayController::OnRootWindowHostResized(const aura::RootWindow* root) {
   gfx::Display display = GetDisplayNearestWindow(root->window());
   if (display_manager->UpdateDisplayBounds(
           display.id(),
-          gfx::Rect(root->GetHostOrigin(), root->GetHostSize()))) {
+          root->host()->GetBounds())) {
     mirror_window_controller_->UpdateWindow();
   }
 }
@@ -714,7 +714,8 @@ void DisplayController::PreDisplayConfigurationChange(bool clear_focus) {
   aura::client::ScreenPositionClient* client =
       aura::client::GetScreenPositionClient(root_window);
   client->ConvertPointFromScreen(root_window, &point_in_screen);
-  root_window->GetDispatcher()->ConvertPointToNativeScreen(&point_in_screen);
+  root_window->GetDispatcher()->host()->ConvertPointToNativeScreen(
+      &point_in_screen);
   cursor_location_in_native_coords_for_restore_ = point_in_screen;
 }
 
@@ -776,7 +777,7 @@ aura::RootWindow* DisplayController::AddRootWindowForDisplay(
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshConstrainPointerToRoot);
   if (base::SysInfo::IsRunningOnChromeOS() || force_constrain_pointer_to_root)
-    root_window->ConfineCursorToWindow();
+    root_window->host()->ConfineCursorToRootWindow();
 #endif
   return root_window;
 }
@@ -799,7 +800,7 @@ void DisplayController::UpdateHostWindowNames() {
     std::string name =
         root_windows[i] == primary ? "aura_root_0" : "aura_root_x";
     gfx::AcceleratedWidget xwindow =
-        root_windows[i]->GetDispatcher()->GetAcceleratedWidget();
+        root_windows[i]->GetDispatcher()->host()->GetAcceleratedWidget();
     XStoreName(gfx::GetXDisplay(), xwindow, name.c_str());
   }
 #endif
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index b424aeb..88a3e7e 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -290,7 +290,7 @@ void GetPrimaryAndSeconary(aura::Window** primary,
 
 std::string GetXWindowName(aura::RootWindow* window) {
   char* name = NULL;
-  XFetchName(gfx::GetXDisplay(), window->GetAcceleratedWidget(), &name);
+  XFetchName(gfx::GetXDisplay(), window->host()->GetAcceleratedWidget(), &name);
   std::string ret(name);
   XFree(name);
   return ret;
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 5f33d5a..f6bd59e 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -591,7 +591,7 @@ TEST_F(DisplayManagerTest, MAYBE_TestNativeDisplaysChangedNoInternal) {
   EXPECT_EQ("1,1 100x100",
             GetDisplayInfoForId(10).bounds_in_native().ToString());
   EXPECT_EQ("100x100", ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->
-      GetHostSize().ToString());
+      host()->GetBounds().size().ToString());
 }
 
 #if defined(OS_WIN)
@@ -979,7 +979,8 @@ TEST_F(DisplayManagerTest, SoftwareMirroring) {
   EXPECT_EQ(1U, display_manager->GetNumDisplays());
   EXPECT_EQ("0,0 300x400",
             Shell::GetScreen()->GetPrimaryDisplay().bounds().ToString());
-  EXPECT_EQ("400x500", test_api.GetRootWindow()->GetHostSize().ToString());
+  EXPECT_EQ("400x500",
+      test_api.GetRootWindow()->host()->GetBounds().size().ToString());
   EXPECT_EQ("300x400",
             test_api.GetRootWindow()->window()->bounds().size().ToString());
   EXPECT_TRUE(display_manager->IsMirrored());
@@ -1092,32 +1093,32 @@ TEST_F(DisplayManagerTest, MAYBE_UpdateDisplayWithHostOrigin) {
   aura::WindowEventDispatcher* dispatcher0 = root_windows[0]->GetDispatcher();
   aura::WindowEventDispatcher* dispatcher1 = root_windows[1]->GetDispatcher();
 
-  EXPECT_EQ("1,1", dispatcher0->GetHostOrigin().ToString());
-  EXPECT_EQ("100x200", dispatcher0->GetHostSize().ToString());
+  EXPECT_EQ("1,1", dispatcher0->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("100x200", dispatcher0->host()->GetBounds().size().ToString());
   // UpdateDisplay set the origin if it's not set.
-  EXPECT_NE("1,1", dispatcher1->GetHostOrigin().ToString());
-  EXPECT_EQ("300x400", dispatcher1->GetHostSize().ToString());
+  EXPECT_NE("1,1", dispatcher1->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("300x400", dispatcher1->host()->GetBounds().size().ToString());
 
   UpdateDisplay("100x200,200+300-300x400");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("0,0", dispatcher0->GetHostOrigin().ToString());
-  EXPECT_EQ("100x200", dispatcher0->GetHostSize().ToString());
-  EXPECT_EQ("200,300", dispatcher1->GetHostOrigin().ToString());
-  EXPECT_EQ("300x400", dispatcher1->GetHostSize().ToString());
+  EXPECT_EQ("0,0", dispatcher0->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("100x200", dispatcher0->host()->GetBounds().size().ToString());
+  EXPECT_EQ("200,300", dispatcher1->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("300x400", dispatcher1->host()->GetBounds().size().ToString());
 
   UpdateDisplay("400+500-200x300,300x400");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("400,500", dispatcher0->GetHostOrigin().ToString());
-  EXPECT_EQ("200x300", dispatcher0->GetHostSize().ToString());
-  EXPECT_EQ("0,0", dispatcher1->GetHostOrigin().ToString());
-  EXPECT_EQ("300x400", dispatcher1->GetHostSize().ToString());
+  EXPECT_EQ("400,500", dispatcher0->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("200x300", dispatcher0->host()->GetBounds().size().ToString());
+  EXPECT_EQ("0,0", dispatcher1->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("300x400", dispatcher1->host()->GetBounds().size().ToString());
 
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("100,200", dispatcher0->GetHostOrigin().ToString());
-  EXPECT_EQ("100x200", dispatcher0->GetHostSize().ToString());
-  EXPECT_EQ("300,500", dispatcher1->GetHostOrigin().ToString());
-  EXPECT_EQ("200x300", dispatcher1->GetHostSize().ToString());
+  EXPECT_EQ("100,200", dispatcher0->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("100x200", dispatcher0->host()->GetBounds().size().ToString());
+  EXPECT_EQ("300,500", dispatcher1->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("200x300", dispatcher1->host()->GetBounds().size().ToString());
 }
 
 }  // namespace internal
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 96e3c62..7e812a4c 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -179,12 +179,12 @@ void MirrorWindowController::UpdateWindow(const DisplayInfo& display_info) {
         display_info.id();
     root_window_->Init();
 #if defined(USE_X11)
-    DisableInput(root_window_->GetAcceleratedWidget());
+    DisableInput(root_window_->host()->GetAcceleratedWidget());
 #endif
 
     aura::client::SetCaptureClient(root_window_->window(),
                                    new NoneCaptureClient());
-    root_window_->ShowRootWindow();
+    root_window_->host()->Show();
 
     // TODO(oshima): Start mirroring.
     aura::Window* mirror_window = new aura::Window(NULL);
@@ -321,9 +321,9 @@ void MirrorWindowController::OnRootWindowHostResized(
     const aura::RootWindow* root) {
   // Do not use |old_size| as it contains RootWindow's (but not host's) size,
   // and this parameter wil be removed soon.
-  if (mirror_window_host_size_ == root->GetHostSize())
+  if (mirror_window_host_size_ == root->host()->GetBounds().size())
     return;
-  mirror_window_host_size_ = root->GetHostSize();
+  mirror_window_host_size_ = root->host()->GetBounds().size();
   reflector_->OnMirroringCompositorResized();
   root_window_->SetRootWindowTransformer(
       CreateRootWindowTransformer().Pass());
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index 9244894..e9f7a42 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -89,20 +89,18 @@ std::pair<aura::Window*, gfx::Point> GetRootWindowRelativeToWindow(
     // extended root window's coordinates.
 
     gfx::Point location_in_native(location_in_root);
-    root_window->GetDispatcher()->ConvertPointToNativeScreen(
+    root_window->GetDispatcher()->host()->ConvertPointToNativeScreen(
         &location_in_native);
 
     aura::Window::Windows root_windows = Shell::GetAllRootWindows();
     for (size_t i = 0; i < root_windows.size(); ++i) {
       aura::WindowEventDispatcher* dispatcher =
           root_windows[i]->GetDispatcher();
-      const gfx::Rect native_bounds(
-          dispatcher->GetHostOrigin(),
-          dispatcher->GetHostSize());  // in px.
+      const gfx::Rect native_bounds = dispatcher->host()->GetBounds();
       if (native_bounds.Contains(location_in_native)) {
         root_window = root_windows[i];
         location_in_root = location_in_native;
-        dispatcher->ConvertPointFromNativeScreen(&location_in_root);
+        dispatcher->host()->ConvertPointFromNativeScreen(&location_in_root);
         break;
       }
     }
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc
index f3b8d65..a9996c2 100644
--- a/ash/display/screen_position_controller_unittest.cc
+++ b/ash/display/screen_position_controller_unittest.cc
@@ -89,14 +89,14 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) {
 
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
-  EXPECT_EQ("100,100",
-            root_windows[0]->GetDispatcher()->GetHostOrigin().ToString());
-  EXPECT_EQ("200x200",
-            root_windows[0]->GetDispatcher()->GetHostSize().ToString());
-  EXPECT_EQ("100,500",
-            root_windows[1]->GetDispatcher()->GetHostOrigin().ToString());
-  EXPECT_EQ("200x200",
-            root_windows[1]->GetDispatcher()->GetHostSize().ToString());
+  EXPECT_EQ("100,100", root_windows[0]->GetDispatcher()->host()->
+      GetBounds().origin().ToString());
+  EXPECT_EQ("200x200", root_windows[0]->GetDispatcher()->host()->
+      GetBounds().size().ToString());
+  EXPECT_EQ("100,500", root_windows[1]->GetDispatcher()->host()->
+      GetBounds().origin().ToString());
+  EXPECT_EQ("200x200", root_windows[1]->GetDispatcher()->host()->
+      GetBounds().size().ToString());
 
   const gfx::Point window_pos(100, 100);
   window_->SetBoundsInScreen(
@@ -178,13 +178,17 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) {
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   EXPECT_EQ("100,100",
-            root_windows[0]->GetDispatcher()->GetHostOrigin().ToString());
+            root_windows[0]->GetDispatcher()->host()->
+                GetBounds().origin().ToString());
   EXPECT_EQ("200x200",
-            root_windows[0]->GetDispatcher()->GetHostSize().ToString());
+            root_windows[0]->GetDispatcher()->host()->
+                GetBounds().size().ToString());
   EXPECT_EQ("100,500",
-            root_windows[1]->GetDispatcher()->GetHostOrigin().ToString());
+            root_windows[1]->GetDispatcher()->host()->
+                GetBounds().origin().ToString());
   EXPECT_EQ("200x200",
-            root_windows[1]->GetDispatcher()->GetHostSize().ToString());
+            root_windows[1]->GetDispatcher()->host()->
+                GetBounds().size().ToString());
 
   // Put |window_| to the primary 2x display.
   window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
diff --git a/ash/display/virtual_keyboard_window_controller.cc b/ash/display/virtual_keyboard_window_controller.cc
index 098c3ce..42f2531 100644
--- a/ash/display/virtual_keyboard_window_controller.cc
+++ b/ash/display/virtual_keyboard_window_controller.cc
@@ -52,7 +52,7 @@ void VirtualKeyboardWindowController::UpdateWindow(
     RootWindowController::CreateForVirtualKeyboardDisplay(root_window);
     root_window_controller_.reset(GetRootWindowController(
         root_window->window()));
-    root_window_controller_->dispatcher()->ShowRootWindow();
+    root_window_controller_->dispatcher()->host()->Show();
   } else {
     aura::RootWindow* root_window = root_window_controller_->dispatcher();
     GetRootWindowSettings(root_window->window())->display_id =