diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:22:45 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:22:45 +0000 |
| commit | bf9cdb36cc79becab099c9f37eb80284fb203f45 (patch) | |
| tree | 4c9011f0aa08ac613027abd372cec3a3b613032b /ash/test/ash_test_helper.cc | |
| parent | fef72c1c9890633a237e06ccb0d0f4ce2ca6c9c1 (diff) | |
| download | chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.zip chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.tar.gz chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.tar.bz2 | |
Make GetRootWindow() return a Window instead of a RootWindow.
Also adds a typedef from RootWindow to WindowEventDispatcher, the eventual name of this type.
Adds a GetDispatcher() method that crawls up to the root Window and returns the WindowEventDispatcher.
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/37733003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 49bb4d1..8981507 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -128,8 +128,8 @@ void AshTestHelper::RunAllPendingInMessageLoop() { run_loop.RunUntilIdle(); } -aura::RootWindow* AshTestHelper::CurrentContext() { - aura::RootWindow* root_window = Shell::GetTargetRootWindow(); +aura::Window* AshTestHelper::CurrentContext() { + aura::Window* root_window = Shell::GetTargetRootWindow(); if (!root_window) root_window = Shell::GetPrimaryRootWindow(); DCHECK(root_window); |