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

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

Issue 13466022: Don't move cursor location when rotation /ui scaling has changed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add explicit bootstrap flag as display_controller is no longer NULL during bootstrap Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »
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_MANAGER_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_
6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 void Init(); 186 void Init();
187 void CycleDisplayImpl(); 187 void CycleDisplayImpl();
188 void ScaleDisplayImpl(); 188 void ScaleDisplayImpl();
189 189
190 gfx::Display& FindDisplayForRootWindow(const aura::RootWindow* root); 190 gfx::Display& FindDisplayForRootWindow(const aura::RootWindow* root);
191 gfx::Display& FindDisplayForId(int64 id); 191 gfx::Display& FindDisplayForId(int64 id);
192 192
193 // Refer to |CreateDisplayFromSpec| API for the format of |spec|. 193 // Refer to |CreateDisplayFromSpec| API for the format of |spec|.
194 void AddDisplayFromSpec(const std::string& spec); 194 void AddDisplayFromSpec(const std::string& spec);
195 195
196 // Checks if the mouse pointer is on one of displays, and moves to
197 // the center of the nearest display if it's outside of all displays.
198 void EnsurePointerInDisplays();
199
200 // Inserts and update the DisplayInfo according to the overscan 196 // Inserts and update the DisplayInfo according to the overscan
201 // state. Note that The DisplayInfo stored in the |internal_display_info_| 197 // state. Note that The DisplayInfo stored in the |internal_display_info_|
202 // can be different from |new_info| (due to overscan state), so 198 // can be different from |new_info| (due to overscan state), so
203 // you must use |GetDisplayInfo| to get the correct DisplayInfo for 199 // you must use |GetDisplayInfo| to get the correct DisplayInfo for
204 // a display. 200 // a display.
205 void InsertAndUpdateDisplayInfo(const DisplayInfo& new_info); 201 void InsertAndUpdateDisplayInfo(const DisplayInfo& new_info);
206 202
207 // Creates a display object from the DisplayInfo for |display_id|. 203 // Creates a display object from the DisplayInfo for |display_id|.
208 gfx::Display CreateDisplayFromDisplayInfoById(int64 display_id); 204 gfx::Display CreateDisplayFromDisplayInfoById(int64 display_id);
209 205
(...skipping 20 matching lines...) Expand all
230 226
231 DISALLOW_COPY_AND_ASSIGN(DisplayManager); 227 DISALLOW_COPY_AND_ASSIGN(DisplayManager);
232 }; 228 };
233 229
234 extern const aura::WindowProperty<int64>* const kDisplayIdKey; 230 extern const aura::WindowProperty<int64>* const kDisplayIdKey;
235 231
236 } // namespace internal 232 } // namespace internal
237 } // namespace ash 233 } // namespace ash
238 234
239 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ 235 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698