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

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

Issue 10827184: Disabling extended desktop (by default). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased. 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 | « ash/ash_switches.cc ('k') | ash/display/display_controller.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
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 const gfx::Point& point_in_root); 81 const gfx::Point& point_in_root);
82 82
83 // aura::DisplayObserver overrides: 83 // aura::DisplayObserver overrides:
84 virtual void OnDisplayBoundsChanged( 84 virtual void OnDisplayBoundsChanged(
85 const gfx::Display& display) OVERRIDE; 85 const gfx::Display& display) OVERRIDE;
86 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; 86 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
87 virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE; 87 virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE;
88 88
89 // Is extended desktop enabled? 89 // Is extended desktop enabled?
90 static bool IsExtendedDesktopEnabled(); 90 static bool IsExtendedDesktopEnabled();
91 // Change the extended desktop mode. Used for testing.
92 static void SetExtendedDesktopEnabled(bool enabled);
91 93
92 private: 94 private:
93 // Creates a root window for |display| and stores it in the |root_windows_| 95 // Creates a root window for |display| and stores it in the |root_windows_|
94 // map. 96 // map.
95 aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display); 97 aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display);
96 98
97 void UpdateDisplayBoundsForLayout(); 99 void UpdateDisplayBoundsForLayout();
98 100
99 std::map<int, aura::RootWindow*> root_windows_; 101 std::map<int, aura::RootWindow*> root_windows_;
100 102
101 SecondaryDisplayLayout secondary_display_layout_; 103 SecondaryDisplayLayout secondary_display_layout_;
102 104
103 // If true, the mouse pointer can't move from one display to another. 105 // If true, the mouse pointer can't move from one display to another.
104 bool dont_warp_mouse_; 106 bool dont_warp_mouse_;
105 107
106 DISALLOW_COPY_AND_ASSIGN(DisplayController); 108 DISALLOW_COPY_AND_ASSIGN(DisplayController);
107 }; 109 };
108 110
109 } // namespace internal 111 } // namespace internal
110 } // namespace ash 112 } // namespace ash
111 113
112 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 114 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698