| 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 "ash/display/display_manager.h" | 12 #include "ash/display/display_manager.h" |
| 13 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/gtest_prod_util.h" | 15 #include "base/gtest_prod_util.h" |
| 16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
| 17 #include "base/memory/weak_ptr.h" | 17 #include "base/memory/weak_ptr.h" |
| 18 #include "base/observer_list.h" | 18 #include "base/observer_list.h" |
| 19 #include "base/time/time.h" | 19 #include "base/time/time.h" |
| 20 #include "ui/aura/window.h" | 20 #include "ui/aura/window.h" |
| 21 #include "ui/aura/window_tree_host_observer.h" | 21 #include "ui/aura/window_tree_host_observer.h" |
| 22 #include "ui/gfx/display_observer.h" | 22 #include "ui/gfx/display_observer.h" |
| 23 #include "ui/gfx/point.h" | 23 #include "ui/gfx/geometry/point.h" |
| 24 | 24 |
| 25 namespace aura { | 25 namespace aura { |
| 26 class Display; | 26 class Display; |
| 27 class WindowTreeHost; | 27 class WindowTreeHost; |
| 28 } | 28 } |
| 29 | 29 |
| 30 namespace base { | 30 namespace base { |
| 31 class Value; | 31 class Value; |
| 32 template <typename T> class JSONValueConverter; | 32 template <typename T> class JSONValueConverter; |
| 33 } | 33 } |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 gfx::Point cursor_location_in_native_coords_for_restore_; | 225 gfx::Point cursor_location_in_native_coords_for_restore_; |
| 226 | 226 |
| 227 base::WeakPtrFactory<DisplayController> weak_ptr_factory_; | 227 base::WeakPtrFactory<DisplayController> weak_ptr_factory_; |
| 228 | 228 |
| 229 DISALLOW_COPY_AND_ASSIGN(DisplayController); | 229 DISALLOW_COPY_AND_ASSIGN(DisplayController); |
| 230 }; | 230 }; |
| 231 | 231 |
| 232 } // namespace ash | 232 } // namespace ash |
| 233 | 233 |
| 234 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ | 234 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
| OLD | NEW |