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/common/wm/root_window_finder.h" |
7 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
8 #include "ash/display/window_tree_host_manager.h" | 9 #include "ash/display/window_tree_host_manager.h" |
9 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
10 #include "ash/root_window_settings.h" | 11 #include "ash/root_window_settings.h" |
11 #include "ash/shelf/shelf_layout_manager.h" | 12 #include "ash/shelf/shelf_layout_manager.h" |
12 #include "ash/shelf/shelf_widget.h" | 13 #include "ash/shelf/shelf_widget.h" |
13 #include "ash/shell.h" | 14 #include "ash/shell.h" |
14 #include "ash/wm/aura/wm_window_aura.h" | 15 #include "ash/wm/aura/wm_window_aura.h" |
15 #include "ash/wm/common/root_window_finder.h" | |
16 #include "base/logging.h" | 16 #include "base/logging.h" |
17 #include "ui/aura/client/screen_position_client.h" | 17 #include "ui/aura/client/screen_position_client.h" |
18 #include "ui/aura/env.h" | 18 #include "ui/aura/env.h" |
19 #include "ui/aura/window_event_dispatcher.h" | 19 #include "ui/aura/window_event_dispatcher.h" |
20 #include "ui/display/display.h" | 20 #include "ui/display/display.h" |
21 #include "ui/display/display_finder.h" | 21 #include "ui/display/display_finder.h" |
22 #include "ui/display/screen.h" | 22 #include "ui/display/screen.h" |
23 | 23 |
24 namespace ash { | 24 namespace ash { |
25 | 25 |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 | 189 |
190 void ScreenAsh::RemoveObserver(display::DisplayObserver* observer) { | 190 void ScreenAsh::RemoveObserver(display::DisplayObserver* observer) { |
191 observers_.RemoveObserver(observer); | 191 observers_.RemoveObserver(observer); |
192 } | 192 } |
193 | 193 |
194 display::Screen* ScreenAsh::CloneForShutdown() { | 194 display::Screen* ScreenAsh::CloneForShutdown() { |
195 return new ScreenForShutdown(this); | 195 return new ScreenForShutdown(this); |
196 } | 196 } |
197 | 197 |
198 } // namespace ash | 198 } // namespace ash |
OLD | NEW |