Make GetRootWindow() return a Window instead of a RootWindow.

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 169 matching lines @@
 
     aura::client::SetCaptureClient(root_window_.get(), new NoneCaptureClient());
     root_window_->ShowRootWindow();
 
     // TODO(oshima): Start mirroring.
     aura::Window* mirror_window = new aura::Window(NULL);
     mirror_window->Init(ui::LAYER_TEXTURED);
     root_window_->AddChild(mirror_window);
     mirror_window->SetBounds(root_window_->bounds());
     mirror_window->Show();
-    reflector_ = ui::ContextFactory::GetInstance()->
-        CreateReflector(Shell::GetPrimaryRootWindow()->compositor(),
-                        mirror_window->layer());
+    reflector_ = ui::ContextFactory::GetInstance()->CreateReflector(
+        Shell::GetPrimaryRootWindow()->GetDispatcher()->compositor(),
+        mirror_window->layer());
 
     cursor_window_ = new aura::Window(cursor_window_delegate_.get());
     cursor_window_->SetTransparent(true);
     cursor_window_->Init(ui::LAYER_TEXTURED);
     root_window_->AddChild(cursor_window_);
     cursor_window_->Show();
   } else {
     GetRootWindowSettings(root_window_.get())->display_id = display_info.id();
     root_window_->SetHostBounds(display_info.bounds_in_native());
   }
@@ skipping 34 matching lines @@
     root_window_->RemoveRootWindowObserver(this);
     root_window_.reset();
     cursor_window_ = NULL;
   }
 }
 
 void MirrorWindowController::UpdateCursorLocation() {
   if (cursor_window_) {
     // TODO(oshima): Rotate cursor image (including hotpoint).
     gfx::Point point = aura::Env::GetInstance()->last_mouse_location();
-    Shell::GetPrimaryRootWindow()->ConvertPointToHost(&point);
+    Shell::GetPrimaryRootWindow()->GetDispatcher()->ConvertPointToHost(&point);
     point.Offset(-hot_point_.x(), -hot_point_.y());
     gfx::Rect bounds = cursor_window_->bounds();
     bounds.set_origin(point);
     cursor_window_->SetBounds(bounds);
   }
 }
 
 void MirrorWindowController::SetMirroredCursor(gfx::NativeCursor cursor) {
   const gfx::Display& display = Shell::GetScreen()->GetPrimaryDisplay();
   if (current_cursor_type_ == cursor.native_type() &&
@@ skipping 76 matching lines @@
       Shell::GetScreen()->GetPrimaryDisplay().id());
   DCHECK(display_manager->mirrored_display().is_valid());
   return scoped_ptr<aura::RootWindowTransformer>(
       internal::CreateRootWindowTransformerForMirroredDisplay(
           source_display_info,
           mirror_display_info));
 }
 
 }  // namespace internal
 }  // namespace ash