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/display/display_controller.cc | |
| 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/display/display_controller.cc')
| -rw-r--r-- | ash/display/display_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index 031a6b1..0bb90b1 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -15,7 +15,7 @@ #include "ash/display/mirror_window_controller.h" #include "ash/display/root_window_transformers.h" #include "ash/display/virtual_keyboard_window_controller.h" -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/root_window_controller.h" #include "ash/root_window_settings.h" #include "ash/screen_util.h" @@ -707,7 +707,7 @@ aura::RootWindow* DisplayController::AddRootWindowForDisplay( GetDisplayManager()->GetDisplayInfo(display.id()); const gfx::Rect& bounds_in_native = display_info.bounds_in_native(); aura::RootWindow::CreateParams params(bounds_in_native); - params.host = Shell::GetInstance()->root_window_host_factory()-> + params.host = Shell::GetInstance()->window_tree_host_factory()-> CreateWindowTreeHost(bounds_in_native); aura::RootWindow* root_window = new aura::RootWindow(params); root_window->window()->SetName( |