| 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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "ui/base/ime/input_method.h" | 23 #include "ui/base/ime/input_method.h" |
| 24 #include "ui/base/ime/input_method_delegate.h" | 24 #include "ui/base/ime/input_method_delegate.h" |
| 25 #include "ui/display/display_observer.h" | 25 #include "ui/display/display_observer.h" |
| 26 #include "ui/display/manager/display_manager.h" | 26 #include "ui/display/manager/display_manager.h" |
| 27 #include "ui/gfx/geometry/point.h" | 27 #include "ui/gfx/geometry/point.h" |
| 28 | 28 |
| 29 namespace aura { | 29 namespace aura { |
| 30 class WindowTreeHost; | 30 class WindowTreeHost; |
| 31 } | 31 } |
| 32 | 32 |
| 33 namespace base { | |
| 34 class Value; | |
| 35 template <typename T> | |
| 36 class JSONValueConverter; | |
| 37 } | |
| 38 | |
| 39 namespace gfx { | 33 namespace gfx { |
| 40 class Insets; | 34 class Insets; |
| 41 } | 35 } |
| 42 | 36 |
| 43 namespace ash { | 37 namespace ash { |
| 44 class AshWindowTreeHost; | 38 class AshWindowTreeHost; |
| 45 struct AshWindowTreeHostInitParams; | 39 struct AshWindowTreeHostInitParams; |
| 46 class CursorWindowController; | 40 class CursorWindowController; |
| 47 class FocusActivationStore; | 41 class FocusActivationStore; |
| 48 class InputMethodEventHandler; | 42 class InputMethodEventHandler; |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 int64_t cursor_display_id_for_restore_; | 217 int64_t cursor_display_id_for_restore_; |
| 224 | 218 |
| 225 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_; | 219 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_; |
| 226 | 220 |
| 227 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager); | 221 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager); |
| 228 }; | 222 }; |
| 229 | 223 |
| 230 } // namespace ash | 224 } // namespace ash |
| 231 | 225 |
| 232 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ | 226 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
| OLD | NEW |