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

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

Issue 902123002: Fix initial hiding and centering cursor on Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | ash/display/display_controller.cc » ('j') | ash/display/display_controller.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 204
205 // Store the primary window tree host temporarily while replacing 205 // Store the primary window tree host temporarily while replacing
206 // display. 206 // display.
207 AshWindowTreeHost* primary_tree_host_for_replace_; 207 AshWindowTreeHost* primary_tree_host_for_replace_;
208 208
209 scoped_ptr<FocusActivationStore> focus_activation_store_; 209 scoped_ptr<FocusActivationStore> focus_activation_store_;
210 210
211 scoped_ptr<CursorWindowController> cursor_window_controller_; 211 scoped_ptr<CursorWindowController> cursor_window_controller_;
212 scoped_ptr<MirrorWindowController> mirror_window_controller_; 212 scoped_ptr<MirrorWindowController> mirror_window_controller_;
213 213
214 // Stores the curent cursor location (in native coordinates) used to 214 // Stores the current cursor location (in native coordinates and screen
215 // restore the cursor location when display configuration 215 // coordinates respectively) used to restore the cursor location when the
216 // changed. 216 // display configuration changes.
217 gfx::Point cursor_location_in_native_coords_for_restore_; 217 gfx::Point cursor_location_in_native_coords_for_restore_;
218 gfx::Point cursor_location_in_screen_coords_for_restore_;
218 219
219 base::WeakPtrFactory<DisplayController> weak_ptr_factory_; 220 base::WeakPtrFactory<DisplayController> weak_ptr_factory_;
220 221
221 DISALLOW_COPY_AND_ASSIGN(DisplayController); 222 DISALLOW_COPY_AND_ASSIGN(DisplayController);
222 }; 223 };
223 224
224 } // namespace ash 225 } // namespace ash
225 226
226 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 227 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_controller.cc » ('j') | ash/display/display_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698