| Index: trunk/src/ash/display/display_controller.cc
|
| ===================================================================
|
| --- trunk/src/ash/display/display_controller.cc (revision 236090)
|
| +++ trunk/src/ash/display/display_controller.cc (working copy)
|
| @@ -671,7 +671,7 @@
|
| base::MessageLoop::current()->DeleteSoon(FROM_HERE, controller);
|
| }
|
|
|
| -void DisplayController::OnWindowTreeHostResized(const aura::RootWindow* root) {
|
| +void DisplayController::OnRootWindowHostResized(const aura::RootWindow* root) {
|
| internal::DisplayManager* display_manager = GetDisplayManager();
|
| gfx::Display display = GetDisplayNearestWindow(root->window());
|
| if (display_manager->UpdateDisplayBounds(
|
| @@ -757,7 +757,7 @@
|
| 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()->
|
| - CreateWindowTreeHost(bounds_in_native);
|
| + CreateRootWindowHost(bounds_in_native);
|
| aura::RootWindow* root_window = new aura::RootWindow(params);
|
| root_window->window()->SetName(
|
| base::StringPrintf("RootWindow-%d", root_window_count++));
|
|
|