| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/display/display_controller.h" | 5 #include "ash/display/display_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <map> | 9 #include <map> |
| 10 | 10 |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 internal::GetRootWindowController(root_window); | 332 internal::GetRootWindowController(root_window); |
| 333 if (controller) { | 333 if (controller) { |
| 334 controller->CloseChildWindows(); | 334 controller->CloseChildWindows(); |
| 335 } else { | 335 } else { |
| 336 while (!root_window->children().empty()) { | 336 while (!root_window->children().empty()) { |
| 337 aura::Window* child = root_window->children()[0]; | 337 aura::Window* child = root_window->children()[0]; |
| 338 delete child; | 338 delete child; |
| 339 } | 339 } |
| 340 } | 340 } |
| 341 } | 341 } |
| 342 if (virtual_keyboard_window_controller_ && |
| 343 virtual_keyboard_window_controller_->root_window_controller()) { |
| 344 virtual_keyboard_window_controller_->root_window_controller()-> |
| 345 CloseChildWindows(); |
| 346 } |
| 342 } | 347 } |
| 343 | 348 |
| 344 aura::Window::Windows DisplayController::GetAllRootWindows() { | 349 aura::Window::Windows DisplayController::GetAllRootWindows() { |
| 345 aura::Window::Windows windows; | 350 aura::Window::Windows windows; |
| 346 for (std::map<int64, aura::Window*>::const_iterator it = | 351 for (std::map<int64, aura::Window*>::const_iterator it = |
| 347 root_windows_.begin(); it != root_windows_.end(); ++it) { | 352 root_windows_.begin(); it != root_windows_.end(); ++it) { |
| 348 DCHECK(it->second); | 353 DCHECK(it->second); |
| 349 if (internal::GetRootWindowController(it->second)) | 354 if (internal::GetRootWindowController(it->second)) |
| 350 windows.push_back(it->second); | 355 windows.push_back(it->second); |
| 351 } | 356 } |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 799 std::string name = | 804 std::string name = |
| 800 root_windows[i] == primary ? "aura_root_0" : "aura_root_x"; | 805 root_windows[i] == primary ? "aura_root_0" : "aura_root_x"; |
| 801 gfx::AcceleratedWidget xwindow = | 806 gfx::AcceleratedWidget xwindow = |
| 802 root_windows[i]->GetDispatcher()->GetAcceleratedWidget(); | 807 root_windows[i]->GetDispatcher()->GetAcceleratedWidget(); |
| 803 XStoreName(gfx::GetXDisplay(), xwindow, name.c_str()); | 808 XStoreName(gfx::GetXDisplay(), xwindow, name.c_str()); |
| 804 } | 809 } |
| 805 #endif | 810 #endif |
| 806 } | 811 } |
| 807 | 812 |
| 808 } // namespace ash | 813 } // namespace ash |
| OLD | NEW |