| 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/window_tree_host_manager.h" | 5 #include "ash/display/window_tree_host_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 for (aura::Window::Windows::iterator iter = root_windows.begin(); | 289 for (aura::Window::Windows::iterator iter = root_windows.begin(); |
| 290 iter != root_windows.end(); ++iter) { | 290 iter != root_windows.end(); ++iter) { |
| 291 RootWindowController* rwc = GetRootWindowController(*iter); | 291 RootWindowController* rwc = GetRootWindowController(*iter); |
| 292 if (GetRootWindowSettings(*iter)->display_id == primary_id) | 292 if (GetRootWindowSettings(*iter)->display_id == primary_id) |
| 293 primary_rwc = rwc; | 293 primary_rwc = rwc; |
| 294 else | 294 else |
| 295 to_delete.push_back(rwc); | 295 to_delete.push_back(rwc); |
| 296 } | 296 } |
| 297 CHECK(primary_rwc); | 297 CHECK(primary_rwc); |
| 298 | 298 |
| 299 for (auto rwc : to_delete) | 299 for (auto* rwc : to_delete) |
| 300 delete rwc; | 300 delete rwc; |
| 301 delete primary_rwc; | 301 delete primary_rwc; |
| 302 } | 302 } |
| 303 | 303 |
| 304 void WindowTreeHostManager::CreatePrimaryHost( | 304 void WindowTreeHostManager::CreatePrimaryHost( |
| 305 const AshWindowTreeHostInitParams& init_params) { | 305 const AshWindowTreeHostInitParams& init_params) { |
| 306 const display::Display& primary_candidate = | 306 const display::Display& primary_candidate = |
| 307 GetDisplayManager()->GetPrimaryDisplayCandidate(); | 307 GetDisplayManager()->GetPrimaryDisplayCandidate(); |
| 308 primary_display_id = primary_candidate.id(); | 308 primary_display_id = primary_candidate.id(); |
| 309 CHECK_NE(display::kInvalidDisplayId, primary_display_id); | 309 CHECK_NE(display::kInvalidDisplayId, primary_display_id); |
| (...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 870 | 870 |
| 871 window_tree_hosts_[display.id()] = ash_host; | 871 window_tree_hosts_[display.id()] = ash_host; |
| 872 SetDisplayPropertiesOnHost(ash_host, display); | 872 SetDisplayPropertiesOnHost(ash_host, display); |
| 873 | 873 |
| 874 if (switches::ConstrainPointerToRoot()) | 874 if (switches::ConstrainPointerToRoot()) |
| 875 ash_host->ConfineCursorToRootWindow(); | 875 ash_host->ConfineCursorToRootWindow(); |
| 876 return ash_host; | 876 return ash_host; |
| 877 } | 877 } |
| 878 | 878 |
| 879 } // namespace ash | 879 } // namespace ash |
| OLD | NEW |