| Index: ash/display/display_controller.cc
|
| diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
|
| index d66af7d88e5a600839ab8fb7e40a39a249d9f7f0..e7bef65b5d7f2475207facd98f8795dd5a124fad 100644
|
| --- a/ash/display/display_controller.cc
|
| +++ b/ash/display/display_controller.cc
|
| @@ -687,7 +687,7 @@ void DisplayController::OnDisplayRemoved(const gfx::Display& display) {
|
| base::MessageLoop::current()->DeleteSoon(FROM_HERE, controller);
|
| }
|
|
|
| -void DisplayController::OnRootWindowHostResized(const aura::RootWindow* root) {
|
| +void DisplayController::OnWindowTreeHostResized(const aura::RootWindow* root) {
|
| internal::DisplayManager* display_manager = GetDisplayManager();
|
| gfx::Display display = GetDisplayNearestWindow(root->window());
|
| if (display_manager->UpdateDisplayBounds(
|
| @@ -772,7 +772,7 @@ aura::RootWindow* DisplayController::AddRootWindowForDisplay(
|
| 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()->
|
| - CreateRootWindowHost(bounds_in_native);
|
| + CreateWindowTreeHost(bounds_in_native);
|
| aura::RootWindow* root_window = new aura::RootWindow(params);
|
| root_window->window()->SetName(
|
| base::StringPrintf("RootWindow-%d", root_window_count++));
|
|
|