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

Unified Diff: ash/display/mirror_window_controller.cc

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month 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/screen_position_controller.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 96e3c625a04c2d8effd99039021564493c93451f..7e812a4ca79f6ac0132069c03feaef28b96d8700 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());
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/screen_position_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698