Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: ash/display/mirror_window_controller.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/mirror_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index acdfe4c0637f096ac9bf85c239706da5aeaf58c4..4703b4510ef8e8603a1791991f1ff75dead005d9 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -187,9 +187,9 @@ void MirrorWindowController::UpdateWindow(const DisplayInfo& display_info) {
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);
@@ -244,7 +244,7 @@ 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);
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/mirror_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698