| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/screen_ash.h" | 5 #include "ash/display/screen_ash.h" |
| 6 | 6 |
| 7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
| 8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/root_window_settings.h" | 10 #include "ash/root_window_settings.h" |
| 11 #include "ash/shelf/shelf_layout_manager.h" | 11 #include "ash/shelf/shelf_layout_manager.h" |
| 12 #include "ash/shelf/shelf_widget.h" | 12 #include "ash/shelf/shelf_widget.h" |
| 13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 14 #include "ash/wm/coordinate_conversion.h" | 14 #include "ash/wm/coordinate_conversion.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "ui/aura/client/screen_position_client.h" | 16 #include "ui/aura/client/screen_position_client.h" |
| 17 #include "ui/aura/env.h" | 17 #include "ui/aura/env.h" |
| 18 #include "ui/aura/root_window.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
| 19 #include "ui/gfx/display.h" | 19 #include "ui/gfx/display.h" |
| 20 #include "ui/gfx/screen.h" | 20 #include "ui/gfx/screen.h" |
| 21 | 21 |
| 22 namespace ash { | 22 namespace ash { |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 internal::DisplayManager* GetDisplayManager() { | 26 internal::DisplayManager* GetDisplayManager() { |
| 27 return Shell::GetInstance()->display_manager(); | 27 return Shell::GetInstance()->display_manager(); |
| 28 } | 28 } |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 | 275 |
| 276 void ScreenAsh::RemoveObserver(gfx::DisplayObserver* observer) { | 276 void ScreenAsh::RemoveObserver(gfx::DisplayObserver* observer) { |
| 277 observers_.RemoveObserver(observer); | 277 observers_.RemoveObserver(observer); |
| 278 } | 278 } |
| 279 | 279 |
| 280 gfx::Screen* ScreenAsh::CloneForShutdown() { | 280 gfx::Screen* ScreenAsh::CloneForShutdown() { |
| 281 return new ScreenForShutdown(this); | 281 return new ScreenForShutdown(this); |
| 282 } | 282 } |
| 283 | 283 |
| 284 } // namespace ash | 284 } // namespace ash |
| OLD | NEW |