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

Side by Side Diff: ash/root_window_controller.h

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix SimpleMessageBoxViews asan failure. 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
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;
35 class SystemTray; 36 class SystemTray;
36 class ToplevelWindowEventHandler; 37 class ToplevelWindowEventHandler;
37 38
38 namespace internal { 39 namespace internal {
39 40
40 class BootSplashScreen; 41 class BootSplashScreen;
41 class PanelLayoutManager; 42 class PanelLayoutManager;
42 class RootWindowLayoutManager; 43 class RootWindowLayoutManager;
43 class ScreenDimmer; 44 class ScreenDimmer;
44 class ShelfLayoutManager; 45 class ShelfLayoutManager;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 bool IsImmersiveMode() const; 170 bool IsImmersiveMode() const;
170 171
171 private: 172 private:
172 // Creates each of the special window containers that holds windows of various 173 // Creates each of the special window containers that holds windows of various
173 // types in the shell UI. 174 // types in the shell UI.
174 void CreateContainersInRootWindow(aura::RootWindow* root_window); 175 void CreateContainersInRootWindow(aura::RootWindow* root_window);
175 176
176 scoped_ptr<aura::RootWindow> root_window_; 177 scoped_ptr<aura::RootWindow> root_window_;
177 RootWindowLayoutManager* root_window_layout_; 178 RootWindowLayoutManager* root_window_layout_;
178 179
180 scoped_ptr<StackingController> stacking_controller_;
181
179 // Widget containing system tray. 182 // Widget containing system tray.
180 StatusAreaWidget* status_area_widget_; 183 StatusAreaWidget* status_area_widget_;
181 184
182 // The shelf for managing the launcher and the status widget. 185 // The shelf for managing the launcher and the status widget.
183 // RootWindowController does not own the shelf. Instead, it is owned 186 // RootWindowController does not own the shelf. Instead, it is owned
184 // by container of the status area. 187 // by container of the status area.
185 ShelfLayoutManager* shelf_; 188 ShelfLayoutManager* shelf_;
186 189
187 // Manages layout of panels. Owned by PanelContainer. 190 // Manages layout of panels. Owned by PanelContainer.
188 PanelLayoutManager* panel_layout_manager_; 191 PanelLayoutManager* panel_layout_manager_;
(...skipping 12 matching lines...) Expand all
201 scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_; 204 scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_;
202 scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_; 205 scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_;
203 206
204 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 207 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
205 }; 208 };
206 209
207 } // namespace internal 210 } // namespace internal
208 } // ash 211 } // ash
209 212
210 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 213 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/root_window_controller.cc » ('j') | chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698