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

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

Issue 10826240: Add a unit test which verifies if the resizer sets/resets DisplayController::dont_warp_mouse_ as ex… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 4 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 | « no previous file | ash/wm/workspace/workspace_window_resizer_unittest.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_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
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/gtest_prod_util.h"
14 #include "ui/aura/display_observer.h" 15 #include "ui/aura/display_observer.h"
15 #include "ui/aura/display_manager.h" 16 #include "ui/aura/display_manager.h"
16 17
17 namespace aura { 18 namespace aura {
18 class Display; 19 class Display;
19 class RootWindow; 20 class RootWindow;
20 } 21 }
21 22
22 namespace ash { 23 namespace ash {
23 namespace internal { 24 namespace internal {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // aura::DisplayObserver overrides: 84 // aura::DisplayObserver overrides:
84 virtual void OnDisplayBoundsChanged( 85 virtual void OnDisplayBoundsChanged(
85 const gfx::Display& display) OVERRIDE; 86 const gfx::Display& display) OVERRIDE;
86 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; 87 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
87 virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE; 88 virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE;
88 89
89 // Is extended desktop enabled? 90 // Is extended desktop enabled?
90 static bool IsExtendedDesktopEnabled(); 91 static bool IsExtendedDesktopEnabled();
91 92
92 private: 93 private:
94 FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, WarpMousePointer);
95
93 // Creates a root window for |display| and stores it in the |root_windows_| 96 // Creates a root window for |display| and stores it in the |root_windows_|
94 // map. 97 // map.
95 aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display); 98 aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display);
96 99
97 void UpdateDisplayBoundsForLayout(); 100 void UpdateDisplayBoundsForLayout();
98 101
99 std::map<int, aura::RootWindow*> root_windows_; 102 std::map<int, aura::RootWindow*> root_windows_;
100 103
101 SecondaryDisplayLayout secondary_display_layout_; 104 SecondaryDisplayLayout secondary_display_layout_;
102 105
103 // If true, the mouse pointer can't move from one display to another. 106 // If true, the mouse pointer can't move from one display to another.
104 bool dont_warp_mouse_; 107 bool dont_warp_mouse_;
105 108
106 DISALLOW_COPY_AND_ASSIGN(DisplayController); 109 DISALLOW_COPY_AND_ASSIGN(DisplayController);
107 }; 110 };
108 111
109 } // namespace internal 112 } // namespace internal
110 } // namespace ash 113 } // namespace ash
111 114
112 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 115 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698