diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 03:42:27 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 03:42:27 +0000 |
| commit | 2374d1813659c2420eda25c884c5f943b292a64d (patch) | |
| tree | 580d99257dd5a9d6a84de4fa70d583d17e985b4c /ash/display/mirror_window_controller.cc | |
| parent | b5126da4daa8f0f0f408afb93e0683f1cf34c82a (diff) | |
| download | chromium_src-2374d1813659c2420eda25c884c5f943b292a64d.zip chromium_src-2374d1813659c2420eda25c884c5f943b292a64d.tar.gz chromium_src-2374d1813659c2420eda25c884c5f943b292a64d.tar.bz2 | |
Window ownership -> WindowTreeHost
Replaces Window::GetDispatcher with Window::GetHost().
Had to clear ScreenPositionClient property prior to window teardown as tests on desktop delete it prior to destroying the window hierarchy. Unhooking the property appears to have no ill-effect.
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/184903003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/mirror_window_controller.cc')
| -rw-r--r-- | ash/display/mirror_window_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index 6b1c69e..7902048 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -110,7 +110,7 @@ void MirrorWindowController::UpdateWindow(const DisplayInfo& display_info) { mirror_window->SetBounds(host_->window()->bounds()); mirror_window->Show(); reflector_ = ui::ContextFactory::GetInstance()->CreateReflector( - Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->compositor(), + Shell::GetPrimaryRootWindow()->GetHost()->compositor(), mirror_window->layer()); } else { GetRootWindowSettings(host_->window())->display_id = display_info.id(); |