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/test/ui_controls_factory_ash.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/test/ui_controls_factory_ash.cc')
| -rw-r--r-- | ash/test/ui_controls_factory_ash.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc index 0a31af5..0c3caa3 100644 --- a/ash/test/ui_controls_factory_ash.cc +++ b/ash/test/ui_controls_factory_ash.cc @@ -35,7 +35,7 @@ UIControlsAura* GetUIControlsForRootWindow(aura::Window* root_window) { root_window->GetProperty(kUIControlsKey); if (!native_ui_control) { native_ui_control = - aura::test::CreateUIControlsAura(root_window->GetDispatcher()); + aura::test::CreateUIControlsAura(root_window->GetHost()->dispatcher()); // Pass the ownership to the |root_window|. root_window->SetProperty(kUIControlsKey, native_ui_control); } |