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

ash/display/mirror_window_controller.cc

 // Copyright (c) 2013 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 "ash/display/mirror_window_controller.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 
 // Xlib.h defines RootWindow.
@@ skipping 161 matching lines @@
     // No need to remove RootWindowObserver because
     // the DisplayController object outlives RootWindow objects.
     root_window_->AddRootWindowObserver(
         Shell::GetInstance()->display_controller());
     root_window_->AddRootWindowObserver(this);
     // TODO(oshima): TouchHUD is using idkey.
     InitRootWindowSettings(root_window_->window())->display_id =
         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);
     mirror_window->Init(ui::LAYER_TEXTURED);
     root_window_->window()->AddChild(mirror_window);
     mirror_window->SetBounds(root_window_->window()->bounds());
     mirror_window->Show();
     reflector_ = ui::ContextFactory::GetInstance()->CreateReflector(
         Shell::GetPrimaryRootWindow()->GetDispatcher()->compositor(),
         mirror_window->layer());
@@ skipping 116 matching lines @@
 
 void MirrorWindowController::SetMirroredCursorVisibility(bool visible) {
   if (cursor_window_)
     visible ? cursor_window_->Show() : cursor_window_->Hide();
 }
 
 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());
   UpdateCursorLocation();
 }
 
 
 scoped_ptr<aura::RootWindowTransformer>
 MirrorWindowController::CreateRootWindowTransformer() const {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   const DisplayInfo& mirror_display_info = display_manager->GetDisplayInfo(
       display_manager->mirrored_display_id());
   const DisplayInfo& source_display_info = display_manager->GetDisplayInfo(
       Shell::GetScreen()->GetPrimaryDisplay().id());
   DCHECK(display_manager->IsMirrored());
   return scoped_ptr<aura::RootWindowTransformer>(
       internal::CreateRootWindowTransformerForMirroredDisplay(
           source_display_info,
           mirror_display_info));
 }
 
 }  // namespace internal
 }  // namespace ash