diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 21:51:26 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 21:51:26 +0000 |
| commit | a657d1a593cbdde72d67d38c640fb1e7fc29c681 (patch) | |
| tree | cc9bea090289bc4a04c3df57858ffa781ed29fc8 /ash/test | |
| parent | 30103b3e9b7a9211c1d705d3899060888f03e801 (diff) | |
| download | chromium_src-a657d1a593cbdde72d67d38c640fb1e7fc29c681.zip chromium_src-a657d1a593cbdde72d67d38c640fb1e7fc29c681.tar.gz chromium_src-a657d1a593cbdde72d67d38c640fb1e7fc29c681.tar.bz2 | |
Rename RootWindowHost* to WindowTreeHost*
TBR=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/76583003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/ash_test_base.cc | 4 | ||||
| -rw-r--r-- | ash/test/test_metro_viewer_process_host.cc | 4 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 4 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 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 be27c7d..d8f682d2 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -140,8 +140,8 @@ void AshTestBase::SetUp() { CHECK(metro_viewer_host_->LaunchViewerAndWaitForConnection( win8::test::kDefaultTestAppUserModelId, L"test_open")); - aura::RemoteRootWindowHostWin* root_window_host = - aura::RemoteRootWindowHostWin::Instance(); + aura::RemoteWindowTreeHostWin* root_window_host = + aura::RemoteWindowTreeHostWin::Instance(); CHECK(root_window_host != NULL); } #endif diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc index 3a58433..4bdfb6c 100644 --- a/ash/test/test_metro_viewer_process_host.cc +++ b/ash/test/test_metro_viewer_process_host.cc @@ -23,14 +23,14 @@ TestMetroViewerProcessHost::~TestMetroViewerProcessHost() { void TestMetroViewerProcessHost::OnChannelError() { closed_unexpectedly_ = true; - aura::RemoteRootWindowHostWin::Instance()->Disconnected(); + aura::RemoteWindowTreeHostWin::Instance()->Disconnected(); } void TestMetroViewerProcessHost::OnSetTargetSurface( gfx::NativeViewId target_surface) { DLOG(INFO) << __FUNCTION__ << ", target_surface = " << target_surface; HWND hwnd = reinterpret_cast<HWND>(target_surface); - aura::RemoteRootWindowHostWin::Instance()->Connected(this, hwnd); + aura::RemoteWindowTreeHostWin::Instance()->Connected(this, hwnd); backing_surface_.reset(new AcceleratedSurface(hwnd)); } diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 40284d9..7810b0d 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -146,8 +146,8 @@ ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::Window* root) { return NULL; } -RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() { - return RootWindowHostFactory::Create(); +WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { + return WindowTreeHostFactory::Create(); } base::string16 TestShellDelegate::GetProductName() const { diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 3edd95c..29e88d7 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -52,7 +52,7 @@ class TestShellDelegate : public ShellDelegate { virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE; virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE; - virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE; + virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE; virtual base::string16 GetProductName() const OVERRIDE; int num_exit_requests() const { return num_exit_requests_; } |