diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 18:54:58 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 18:54:58 +0000 |
| commit | e8cf7330b0f4187726568d1363eb85d7fd404f16 (patch) | |
| tree | eee645c53b6381054c0955a8bba7490038a6b3ef /ash/test | |
| parent | 36f33ddbf966257d3f59239b10d61bb9b54688fd (diff) | |
| download | chromium_src-e8cf7330b0f4187726568d1363eb85d7fd404f16.zip chromium_src-e8cf7330b0f4187726568d1363eb85d7fd404f16.tar.gz chromium_src-e8cf7330b0f4187726568d1363eb85d7fd404f16.tar.bz2 | |
Move root_window_host* in aura to window_tree_host*.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/160573002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/ash_test_base.cc | 8 | ||||
| -rw-r--r-- | ash/test/ash_test_helper.cc | 2 | ||||
| -rw-r--r-- | ash/test/test_metro_viewer_process_host.cc | 2 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index cddd713..c1b03ac 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -43,8 +43,8 @@ #include "base/test/test_process_killer_win.h" #include "base/win/metro.h" #include "base/win/windows_version.h" -#include "ui/aura/remote_root_window_host_win.h" -#include "ui/aura/root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" +#include "ui/aura/window_tree_host_win.h" #include "win8/test/test_registrar_constants.h" #endif @@ -143,9 +143,9 @@ void AshTestBase::SetUp() { new TestMetroViewerProcessHost(ipc_thread_->message_loop_proxy())); CHECK(metro_viewer_host_->LaunchViewerAndWaitForConnection( win8::test::kDefaultTestAppUserModelId)); - aura::RemoteWindowTreeHostWin* root_window_host = + aura::RemoteWindowTreeHostWin* window_tree_host = aura::RemoteWindowTreeHostWin::Instance(); - CHECK(root_window_host != NULL); + CHECK(window_tree_host != NULL); } ash::WindowPositioner::SetMaximizeFirstWindow(true); } diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 4ed2dc1..ed154c5 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -31,7 +31,7 @@ #endif #if defined(USE_X11) -#include "ui/aura/root_window_host_x11.h" +#include "ui/aura/window_tree_host_x11.h" #endif namespace ash { diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc index 652b6d4..ddcfa1b 100644 --- a/ash/test/test_metro_viewer_process_host.cc +++ b/ash/test/test_metro_viewer_process_host.cc @@ -7,7 +7,7 @@ #include <windef.h> #include "base/logging.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" namespace ash { namespace test { diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index ade6dae..70e2117 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -9,7 +9,7 @@ #include "ash/caps_lock_delegate_stub.h" #include "ash/default_accessibility_delegate.h" #include "ash/gpu_support_stub.h" -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/media_delegate.h" #include "ash/new_window_delegate.h" #include "ash/session_state_delegate.h" |