Chromium Code Reviews| Index: ash/wm/overview/window_selector.h |
| diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h |
| index a270b489a739a3f215f9d4b9817005a4f5803031..576cbba9edf50e746c07339cdbdb4a2731926a3b 100644 |
| --- a/ash/wm/overview/window_selector.h |
| +++ b/ash/wm/overview/window_selector.h |
| @@ -66,16 +66,29 @@ class ASH_EXPORT WindowSelector |
| typedef std::vector<aura::Window*> WindowList; |
| typedef ScopedVector<WindowSelectorItem> WindowSelectorItemList; |
| - WindowSelector(const WindowList& windows, |
| - WindowSelectorDelegate* delegate); |
| + explicit WindowSelector(WindowSelectorDelegate* delegate); |
| ~WindowSelector() override; |
| + // NOTE: The work done in Init() and Shutdown() is not done in the |
|
jonross
2015/01/15 19:39:42
Could this information be worked into the existing
bruthig
2015/01/16 19:54:43
Moved these 'implementation' specific comments to
|
| + // constructor/destructor because it may cause other, unrelated classes, |
| + // (ie PanelLayoutManager) to make indirect calls to |
| + // restoring_minimized_windows() on a partially constructed/destructed object. |
| + |
| + // Initialize with the windows that can be selected. |
| + void Init(const WindowList& windows); |
| + // Perform cleanup that cannot be done in the destructor. |
|
jonross
2015/01/15 19:39:42
nit: space between non-override methods that have
bruthig
2015/01/16 19:54:43
Done.
|
| + void Shutdown(); |
| + |
| // Cancels window selection. |
| void CancelSelection(); |
| // Called when the last window selector item from a grid is deleted. |
| void OnGridEmpty(WindowGrid* grid); |
| + bool restoring_minimized_windows() const { |
| + return restoring_minimized_windows_; |
| + } |
| + |
| // gfx::DisplayObserver: |
| void OnDisplayAdded(const gfx::Display& display) override; |
| void OnDisplayRemoved(const gfx::Display& display) override; |
| @@ -169,6 +182,10 @@ class ASH_EXPORT WindowSelector |
| // during this overview mode session. |
| size_t num_times_textfield_cleared_; |
| + // Tracks whether minimized windows are currently being restored for overview |
| + // mode. |
| + bool restoring_minimized_windows_; |
| + |
| DISALLOW_COPY_AND_ASSIGN(WindowSelector); |
| }; |