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

Side by Side Diff: ash/root_window_controller.h

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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/root_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_ROOT_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_
6 #define ASH_ROOT_WINDOW_CONTROLLER_H_ 6 #define ASH_ROOT_WINDOW_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf_types.h" 9 #include "ash/shelf_types.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
(...skipping 14 matching lines...) Expand all
25 25
26 namespace views { 26 namespace views {
27 namespace corewm { 27 namespace corewm {
28 class InputMethodEventFilter; 28 class InputMethodEventFilter;
29 class RootWindowEventFilter; 29 class RootWindowEventFilter;
30 } 30 }
31 } 31 }
32 32
33 namespace ash { 33 namespace ash {
34 class Launcher; 34 class Launcher;
35 class StackingController;
36 class SystemTray; 35 class SystemTray;
37 class ToplevelWindowEventHandler; 36 class ToplevelWindowEventHandler;
38 37
39 namespace internal { 38 namespace internal {
40 39
41 class BootSplashScreen; 40 class BootSplashScreen;
42 class PanelLayoutManager; 41 class PanelLayoutManager;
43 class RootWindowLayoutManager; 42 class RootWindowLayoutManager;
44 class ScreenDimmer; 43 class ScreenDimmer;
45 class ShelfLayoutManager; 44 class ShelfLayoutManager;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 bool IsImmersiveMode() const; 169 bool IsImmersiveMode() const;
171 170
172 private: 171 private:
173 // Creates each of the special window containers that holds windows of various 172 // Creates each of the special window containers that holds windows of various
174 // types in the shell UI. 173 // types in the shell UI.
175 void CreateContainersInRootWindow(aura::RootWindow* root_window); 174 void CreateContainersInRootWindow(aura::RootWindow* root_window);
176 175
177 scoped_ptr<aura::RootWindow> root_window_; 176 scoped_ptr<aura::RootWindow> root_window_;
178 RootWindowLayoutManager* root_window_layout_; 177 RootWindowLayoutManager* root_window_layout_;
179 178
180 scoped_ptr<StackingController> stacking_controller_;
181
182 // Widget containing system tray. 179 // Widget containing system tray.
183 StatusAreaWidget* status_area_widget_; 180 StatusAreaWidget* status_area_widget_;
184 181
185 // The shelf for managing the launcher and the status widget. 182 // The shelf for managing the launcher and the status widget.
186 // RootWindowController does not own the shelf. Instead, it is owned 183 // RootWindowController does not own the shelf. Instead, it is owned
187 // by container of the status area. 184 // by container of the status area.
188 ShelfLayoutManager* shelf_; 185 ShelfLayoutManager* shelf_;
189 186
190 // Manages layout of panels. Owned by PanelContainer. 187 // Manages layout of panels. Owned by PanelContainer.
191 PanelLayoutManager* panel_layout_manager_; 188 PanelLayoutManager* panel_layout_manager_;
(...skipping 12 matching lines...) Expand all
204 scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_; 201 scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_;
205 scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_; 202 scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_;
206 203
207 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 204 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
208 }; 205 };
209 206
210 } // namespace internal 207 } // namespace internal
211 } // ash 208 } // ash
212 209
213 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 210 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698