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

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: add file ui/aura/touch_ctm.h(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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 virtual void OnWindowTreeHostResized( 153 virtual void OnWindowTreeHostResized(
154 const aura::WindowEventDispatcher* root) OVERRIDE; 154 const aura::WindowEventDispatcher* root) OVERRIDE;
155 155
156 // aura::DisplayManager::Delegate overrides: 156 // aura::DisplayManager::Delegate overrides:
157 virtual void CreateOrUpdateNonDesktopDisplay( 157 virtual void CreateOrUpdateNonDesktopDisplay(
158 const internal::DisplayInfo& info) OVERRIDE; 158 const internal::DisplayInfo& info) OVERRIDE;
159 virtual void CloseNonDesktopDisplay() OVERRIDE; 159 virtual void CloseNonDesktopDisplay() OVERRIDE;
160 virtual void PreDisplayConfigurationChange(bool clear_focus) OVERRIDE; 160 virtual void PreDisplayConfigurationChange(bool clear_focus) OVERRIDE;
161 virtual void PostDisplayConfigurationChange() OVERRIDE; 161 virtual void PostDisplayConfigurationChange() OVERRIDE;
162 162
163 // Updates the TouchCTM for touch device and pushes the new TouchCTM into
164 // root windows.
165 void UpdateTouchCTM();
166
163 private: 167 private:
164 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated); 168 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated);
165 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, SecondaryDisplayLayout); 169 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, SecondaryDisplayLayout);
166 friend class internal::DisplayManager; 170 friend class internal::DisplayManager;
167 friend class internal::MirrorWindowController; 171 friend class internal::MirrorWindowController;
168 172
169 // Creates a root window for |display| and stores it in the |root_windows_| 173 // Creates a root window for |display| and stores it in the |root_windows_|
170 // map. 174 // map.
171 aura::WindowEventDispatcher* AddRootWindowForDisplay( 175 aura::WindowEventDispatcher* AddRootWindowForDisplay(
172 const gfx::Display& display); 176 const gfx::Display& display);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // restore the cursor location when display configuration 219 // restore the cursor location when display configuration
216 // changed. 220 // changed.
217 gfx::Point cursor_location_in_native_coords_for_restore_; 221 gfx::Point cursor_location_in_native_coords_for_restore_;
218 222
219 DISALLOW_COPY_AND_ASSIGN(DisplayController); 223 DISALLOW_COPY_AND_ASSIGN(DisplayController);
220 }; 224 };
221 225
222 } // namespace ash 226 } // namespace ash
223 227
224 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 228 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698