| 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 | 8 |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/display/multi_display_manager.h" | 10 #include "ash/display/multi_display_manager.h" |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 std::vector<aura::RootWindow*> windows; | 277 std::vector<aura::RootWindow*> windows; |
| 278 for (std::map<int64, aura::RootWindow*>::const_iterator it = | 278 for (std::map<int64, aura::RootWindow*>::const_iterator it = |
| 279 root_windows_.begin(); it != root_windows_.end(); ++it) { | 279 root_windows_.begin(); it != root_windows_.end(); ++it) { |
| 280 DCHECK(it->second); | 280 DCHECK(it->second); |
| 281 if (GetRootWindowController(it->second)) | 281 if (GetRootWindowController(it->second)) |
| 282 windows.push_back(it->second); | 282 windows.push_back(it->second); |
| 283 } | 283 } |
| 284 return windows; | 284 return windows; |
| 285 } | 285 } |
| 286 | 286 |
| 287 gfx::Insets DisplayController::GetOverscanInsets(int64 display_id) { |
| 288 return GetDisplayManager()->GetOverscanInsets(display_id); |
| 289 } |
| 290 |
| 287 std::vector<internal::RootWindowController*> | 291 std::vector<internal::RootWindowController*> |
| 288 DisplayController::GetAllRootWindowControllers() { | 292 DisplayController::GetAllRootWindowControllers() { |
| 289 std::vector<internal::RootWindowController*> controllers; | 293 std::vector<internal::RootWindowController*> controllers; |
| 290 for (std::map<int64, aura::RootWindow*>::const_iterator it = | 294 for (std::map<int64, aura::RootWindow*>::const_iterator it = |
| 291 root_windows_.begin(); it != root_windows_.end(); ++it) { | 295 root_windows_.begin(); it != root_windows_.end(); ++it) { |
| 292 internal::RootWindowController* controller = | 296 internal::RootWindowController* controller = |
| 293 GetRootWindowController(it->second); | 297 GetRootWindowController(it->second); |
| 294 if (controller) | 298 if (controller) |
| 295 controllers.push_back(controller); | 299 controllers.push_back(controller); |
| 296 } | 300 } |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 secondary_display->set_bounds( | 540 secondary_display->set_bounds( |
| 537 gfx::Rect(new_secondary_origin, secondary_bounds.size())); | 541 gfx::Rect(new_secondary_origin, secondary_bounds.size())); |
| 538 secondary_display->UpdateWorkAreaFromInsets(insets); | 542 secondary_display->UpdateWorkAreaFromInsets(insets); |
| 539 } | 543 } |
| 540 | 544 |
| 541 void DisplayController::NotifyDisplayConfigurationChanging() { | 545 void DisplayController::NotifyDisplayConfigurationChanging() { |
| 542 FOR_EACH_OBSERVER(Observer, observers_, OnDisplayConfigurationChanging()); | 546 FOR_EACH_OBSERVER(Observer, observers_, OnDisplayConfigurationChanging()); |
| 543 } | 547 } |
| 544 | 548 |
| 545 } // namespace ash | 549 } // namespace ash |
| OLD | NEW |