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 #ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
6 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_ | 6 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "ash/ash_export.h" | 11 #include "ash/ash_export.h" |
12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
14 #include "base/gtest_prod_util.h" | 14 #include "base/gtest_prod_util.h" |
15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
17 #include "base/time.h" | 17 #include "base/time/time.h" |
| 18 #include "ui/gfx/display.h" |
18 #include "ui/gfx/display_observer.h" | 19 #include "ui/gfx/display_observer.h" |
19 #include "ui/gfx/display.h" | |
20 | 20 |
21 namespace aura { | 21 namespace aura { |
22 class Display; | 22 class Display; |
23 class RootWindow; | 23 class RootWindow; |
24 } | 24 } |
25 | 25 |
26 namespace base { | 26 namespace base { |
27 class Value; | 27 class Value; |
28 template <typename T> class JSONValueConverter; | 28 template <typename T> class JSONValueConverter; |
29 } | 29 } |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 bool in_bootstrap_; | 275 bool in_bootstrap_; |
276 | 276 |
277 scoped_ptr<internal::FocusActivationStore> focus_activation_store_; | 277 scoped_ptr<internal::FocusActivationStore> focus_activation_store_; |
278 | 278 |
279 DISALLOW_COPY_AND_ASSIGN(DisplayController); | 279 DISALLOW_COPY_AND_ASSIGN(DisplayController); |
280 }; | 280 }; |
281 | 281 |
282 } // namespace ash | 282 } // namespace ash |
283 | 283 |
284 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ | 284 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
OLD | NEW |