| 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 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 static int64 GetPrimaryDisplayId(); | 83 static int64 GetPrimaryDisplayId(); |
| 84 | 84 |
| 85 CursorWindowController* cursor_window_controller() { | 85 CursorWindowController* cursor_window_controller() { |
| 86 return cursor_window_controller_.get(); | 86 return cursor_window_controller_.get(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 MirrorWindowController* mirror_window_controller() { | 89 MirrorWindowController* mirror_window_controller() { |
| 90 return mirror_window_controller_.get(); | 90 return mirror_window_controller_.get(); |
| 91 } | 91 } |
| 92 | 92 |
| 93 VirtualKeyboardWindowController* virtual_keyboard_window_controller() { | |
| 94 return virtual_keyboard_window_controller_.get(); | |
| 95 } | |
| 96 | |
| 97 // Create a WindowTreeHost for the primary display. This replaces | 93 // Create a WindowTreeHost for the primary display. This replaces |
| 98 // |initial_bounds| in |init_params|. | 94 // |initial_bounds| in |init_params|. |
| 99 void CreatePrimaryHost(const AshWindowTreeHostInitParams& init_params); | 95 void CreatePrimaryHost(const AshWindowTreeHostInitParams& init_params); |
| 100 | 96 |
| 101 // Initializes all displays. | 97 // Initializes all displays. |
| 102 void InitDisplays(); | 98 void InitDisplays(); |
| 103 | 99 |
| 104 // Add/Remove observers. | 100 // Add/Remove observers. |
| 105 void AddObserver(Observer* observer); | 101 void AddObserver(Observer* observer); |
| 106 void RemoveObserver(Observer* observer); | 102 void RemoveObserver(Observer* observer); |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 ObserverList<Observer> observers_; | 205 ObserverList<Observer> observers_; |
| 210 | 206 |
| 211 // Store the primary window tree host temporarily while replacing | 207 // Store the primary window tree host temporarily while replacing |
| 212 // display. | 208 // display. |
| 213 AshWindowTreeHost* primary_tree_host_for_replace_; | 209 AshWindowTreeHost* primary_tree_host_for_replace_; |
| 214 | 210 |
| 215 scoped_ptr<FocusActivationStore> focus_activation_store_; | 211 scoped_ptr<FocusActivationStore> focus_activation_store_; |
| 216 | 212 |
| 217 scoped_ptr<CursorWindowController> cursor_window_controller_; | 213 scoped_ptr<CursorWindowController> cursor_window_controller_; |
| 218 scoped_ptr<MirrorWindowController> mirror_window_controller_; | 214 scoped_ptr<MirrorWindowController> mirror_window_controller_; |
| 219 scoped_ptr<VirtualKeyboardWindowController> | |
| 220 virtual_keyboard_window_controller_; | |
| 221 | 215 |
| 222 // Stores the curent cursor location (in native coordinates) used to | 216 // Stores the curent cursor location (in native coordinates) used to |
| 223 // restore the cursor location when display configuration | 217 // restore the cursor location when display configuration |
| 224 // changed. | 218 // changed. |
| 225 gfx::Point cursor_location_in_native_coords_for_restore_; | 219 gfx::Point cursor_location_in_native_coords_for_restore_; |
| 226 | 220 |
| 227 base::WeakPtrFactory<DisplayController> weak_ptr_factory_; | 221 base::WeakPtrFactory<DisplayController> weak_ptr_factory_; |
| 228 | 222 |
| 229 DISALLOW_COPY_AND_ASSIGN(DisplayController); | 223 DISALLOW_COPY_AND_ASSIGN(DisplayController); |
| 230 }; | 224 }; |
| 231 | 225 |
| 232 } // namespace ash | 226 } // namespace ash |
| 233 | 227 |
| 234 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ | 228 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
| OLD | NEW |