Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: ash/display/display_controller.h

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: move CTM update code into a separate file ash/touch/touch_ctm_controller.cc Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
83 83
84 internal::MirrorWindowController* mirror_window_controller() { 84 internal::MirrorWindowController* mirror_window_controller() {
85 return mirror_window_controller_.get(); 85 return mirror_window_controller_.get();
86 } 86 }
87 87
88 internal::VirtualKeyboardWindowController* 88 internal::VirtualKeyboardWindowController*
89 virtual_keyboard_window_controller() { 89 virtual_keyboard_window_controller() {
90 return virtual_keyboard_window_controller_.get(); 90 return virtual_keyboard_window_controller_.get();
91 } 91 }
92 92
93 const std::map<int64, aura::Window*>& root_windows() {
94 return root_windows_;
95 }
oshima 2014/03/14 21:53:53 can you use GetAllRootWindows instead?
Yufeng Shen (Slow to review) 2014/04/29 20:34:18 removed.
96
93 // Initializes primary display. 97 // Initializes primary display.
94 void InitPrimaryDisplay(); 98 void InitPrimaryDisplay();
95 99
96 // Initialize secondary displays. 100 // Initialize secondary displays.
97 void InitSecondaryDisplays(); 101 void InitSecondaryDisplays();
98 102
99 // Add/Remove observers. 103 // Add/Remove observers.
100 void AddObserver(Observer* observer); 104 void AddObserver(Observer* observer);
101 void RemoveObserver(Observer* observer); 105 void RemoveObserver(Observer* observer);
102 106
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // restore the cursor location when display configuration 218 // restore the cursor location when display configuration
215 // changed. 219 // changed.
216 gfx::Point cursor_location_in_native_coords_for_restore_; 220 gfx::Point cursor_location_in_native_coords_for_restore_;
217 221
218 DISALLOW_COPY_AND_ASSIGN(DisplayController); 222 DISALLOW_COPY_AND_ASSIGN(DisplayController);
219 }; 223 };
220 224
221 } // namespace ash 225 } // namespace ash
222 226
223 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 227 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698