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

Side by Side Diff: ash/root_window_controller.h

Issue 1929203002: mash: Fix crash when clicking on the shelf overflow icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | ash/shelf/overflow_bubble.cc » ('j') | ash/system/tray/tray_background_view.cc » ('J')
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 <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 class AshTouchExplorationManager; 70 class AshTouchExplorationManager;
71 #endif 71 #endif
72 72
73 // This class maintains the per root window state for ash. This class 73 // This class maintains the per root window state for ash. This class
74 // owns the root window and other dependent objects that should be 74 // owns the root window and other dependent objects that should be
75 // deleted upon the deletion of the root window. This object is 75 // deleted upon the deletion of the root window. This object is
76 // indirectly owned and deleted by |WindowTreeHostManager|. 76 // indirectly owned and deleted by |WindowTreeHostManager|.
77 // The RootWindowController for particular root window is stored in 77 // The RootWindowController for particular root window is stored in
78 // its property (RootWindowSettings) and can be obtained using 78 // its property (RootWindowSettings) and can be obtained using
79 // |GetRootWindowController(aura::WindowEventDispatcher*)| function. 79 // |GetRootWindowController(aura::WindowEventDispatcher*)| function.
80 //
81 // NOTE: In classic ash there is one RootWindow per display, so every RootWindow
82 // has a RootWindowController. In mus/mash there is one RootWindow per Widget,
msw 2016/04/28 23:57:36 q: Is it one per top-level widget?
James Cook 2016/04/29 16:17:40 Yep, one per top-level widget. Updated.
83 // so not all RootWindows have a RootWindowController.
80 class ASH_EXPORT RootWindowController : public ShellObserver { 84 class ASH_EXPORT RootWindowController : public ShellObserver {
81 public: 85 public:
82 // Creates and Initialize the RootWindowController for primary display. 86 // Creates and Initialize the RootWindowController for primary display.
83 static void CreateForPrimaryDisplay(AshWindowTreeHost* host); 87 static void CreateForPrimaryDisplay(AshWindowTreeHost* host);
84 88
85 // Creates and Initialize the RootWindowController for secondary displays. 89 // Creates and Initialize the RootWindowController for secondary displays.
86 static void CreateForSecondaryDisplay(AshWindowTreeHost* host); 90 static void CreateForSecondaryDisplay(AshWindowTreeHost* host);
87 91
88 // Returns a RootWindowController of the window's root window. 92 // Returns a RootWindowController of the window's root window.
89 static RootWindowController* ForWindow(const aura::Window* window); 93 static RootWindowController* ForWindow(const aura::Window* window);
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 }; 310 };
307 311
308 312
309 // Gets the RootWindowController for |root_window|. 313 // Gets the RootWindowController for |root_window|.
310 ASH_EXPORT RootWindowController* GetRootWindowController( 314 ASH_EXPORT RootWindowController* GetRootWindowController(
311 const aura::Window* root_window); 315 const aura::Window* root_window);
312 316
313 } // namespace ash 317 } // namespace ash
314 318
315 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 319 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/overflow_bubble.cc » ('j') | ash/system/tray/tray_background_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698