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

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

Issue 18218002: Don't create mirror window during bootstrap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/display/mirror_window_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 20 matching lines...) Expand all
31 namespace gfx { 31 namespace gfx {
32 class Display; 32 class Display;
33 class Insets; 33 class Insets;
34 class Point; 34 class Point;
35 } 35 }
36 36
37 namespace ash { 37 namespace ash {
38 namespace internal { 38 namespace internal {
39 class DisplayManager; 39 class DisplayManager;
40 class FocusActivationStore; 40 class FocusActivationStore;
41 class MirrorWindowController;
41 class RootWindowController; 42 class RootWindowController;
42 } 43 }
43 44
44 // DisplayController owns and maintains RootWindows for each attached 45 // DisplayController owns and maintains RootWindows for each attached
45 // display, keeping them in sync with display configuration changes. 46 // display, keeping them in sync with display configuration changes.
46 class ASH_EXPORT DisplayController : public gfx::DisplayObserver { 47 class ASH_EXPORT DisplayController : public gfx::DisplayObserver {
47 public: 48 public:
48 class ASH_EXPORT Observer { 49 class ASH_EXPORT Observer {
49 public: 50 public:
50 // Invoked when the display configuration change is requested, 51 // Invoked when the display configuration change is requested,
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 void UpdateMouseCursor(const gfx::Point& point_in_native); 160 void UpdateMouseCursor(const gfx::Point& point_in_native);
160 161
161 // aura::DisplayObserver overrides: 162 // aura::DisplayObserver overrides:
162 virtual void OnDisplayBoundsChanged( 163 virtual void OnDisplayBoundsChanged(
163 const gfx::Display& display) OVERRIDE; 164 const gfx::Display& display) OVERRIDE;
164 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; 165 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
165 virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE; 166 virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE;
166 167
167 private: 168 private:
168 friend class internal::DisplayManager; 169 friend class internal::DisplayManager;
170 friend class internal::MirrorWindowController;
169 171
170 // Creates a root window for |display| and stores it in the |root_windows_| 172 // Creates a root window for |display| and stores it in the |root_windows_|
171 // map. 173 // map.
172 aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display); 174 aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display);
173 175
174 void UpdateDisplayBoundsForLayout(); 176 void UpdateDisplayBoundsForLayout();
175 177
176 void NotifyDisplayConfigurationChanging(); 178 void NotifyDisplayConfigurationChanging();
177 void NotifyDisplayConfigurationChanged(); 179 void NotifyDisplayConfigurationChanged();
178 180
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 bool in_bootstrap_; 237 bool in_bootstrap_;
236 238
237 scoped_ptr<internal::FocusActivationStore> focus_activation_store_; 239 scoped_ptr<internal::FocusActivationStore> focus_activation_store_;
238 240
239 DISALLOW_COPY_AND_ASSIGN(DisplayController); 241 DISALLOW_COPY_AND_ASSIGN(DisplayController);
240 }; 242 };
241 243
242 } // namespace ash 244 } // namespace ash
243 245
244 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 246 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698