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

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

Issue 2282903003: Remove MouseWarpController construction from ash::DisplayManager (Closed)
Patch Set: rebased Created 4 years, 3 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_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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 27 matching lines...) Expand all
38 class DisplayLayoutStore; 38 class DisplayLayoutStore;
39 } 39 }
40 40
41 namespace gfx { 41 namespace gfx {
42 class Insets; 42 class Insets;
43 class Rect; 43 class Rect;
44 } 44 }
45 45
46 namespace ash { 46 namespace ash {
47 class AcceleratorControllerTest; 47 class AcceleratorControllerTest;
48 class MouseWarpController;
49 class ScreenAsh; 48 class ScreenAsh;
50 49
51 using DisplayInfoList = std::vector<display::ManagedDisplayInfo>; 50 using DisplayInfoList = std::vector<display::ManagedDisplayInfo>;
52 51
53 namespace test { 52 namespace test {
54 class AshTestBase; 53 class AshTestBase;
55 class DisplayManagerTestApi; 54 class DisplayManagerTestApi;
56 class SystemGestureEventFilterTest; 55 class SystemGestureEventFilterTest;
57 } 56 }
58 57
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 // impl to |SetDefaultMultiDisplayMode|. 320 // impl to |SetDefaultMultiDisplayMode|.
322 void ReconfigureDisplays(); 321 void ReconfigureDisplays();
323 322
324 // Update the bounds of the display given by |display_id|. 323 // Update the bounds of the display given by |display_id|.
325 bool UpdateDisplayBounds(int64_t display_id, const gfx::Rect& new_bounds); 324 bool UpdateDisplayBounds(int64_t display_id, const gfx::Rect& new_bounds);
326 325
327 // Creates mirror window asynchronously if the software mirror mode 326 // Creates mirror window asynchronously if the software mirror mode
328 // is enabled. 327 // is enabled.
329 void CreateMirrorWindowAsyncIfAny(); 328 void CreateMirrorWindowAsyncIfAny();
330 329
331 // Creates a MouseWarpController for the current display
332 // configuration. |drag_source| is the window where dragging
333 // started, or nullptr otherwise.
334 std::unique_ptr<MouseWarpController> CreateMouseWarpController(
335 aura::Window* drag_source) const;
336
337 // Create a screen instance to be used during shutdown. 330 // Create a screen instance to be used during shutdown.
338 void CreateScreenForShutdown() const; 331 void CreateScreenForShutdown() const;
339 332
340 // A unit test may change the internal display id (which never happens on 333 // A unit test may change the internal display id (which never happens on
341 // a real device). This will update the mode list for internal display 334 // a real device). This will update the mode list for internal display
342 // for this test scenario. 335 // for this test scenario.
343 void UpdateInternalManagedDisplayModeListForTest(); 336 void UpdateInternalManagedDisplayModeListForTest();
344 337
345 // Zoom the internal display. 338 // Zoom the internal display.
346 bool ZoomInternalDisplay(bool up); 339 bool ZoomInternalDisplay(bool up);
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 bool unified_desktop_enabled_; 471 bool unified_desktop_enabled_;
479 472
480 base::WeakPtrFactory<DisplayManager> weak_ptr_factory_; 473 base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
481 474
482 DISALLOW_COPY_AND_ASSIGN(DisplayManager); 475 DISALLOW_COPY_AND_ASSIGN(DisplayManager);
483 }; 476 };
484 477
485 } // namespace ash 478 } // namespace ash
486 479
487 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ 480 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698