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

Side by Side Diff: ash/wm/overview/window_selector.h

Issue 844763006: Change overview mode to so that docked panel windows are not grouped together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved restore window animation out of the ScopedTransformOverviewWindow destructor. Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_WM_OVERVIEW_WINDOW_SELECTOR_H_ 5 #ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_ 6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 enum Direction { 59 enum Direction {
60 LEFT, 60 LEFT,
61 UP, 61 UP,
62 RIGHT, 62 RIGHT,
63 DOWN 63 DOWN
64 }; 64 };
65 65
66 typedef std::vector<aura::Window*> WindowList; 66 typedef std::vector<aura::Window*> WindowList;
67 typedef ScopedVector<WindowSelectorItem> WindowSelectorItemList; 67 typedef ScopedVector<WindowSelectorItem> WindowSelectorItemList;
68 68
69 WindowSelector(const WindowList& windows, 69 explicit WindowSelector(WindowSelectorDelegate* delegate);
70 WindowSelectorDelegate* delegate);
71 ~WindowSelector() override; 70 ~WindowSelector() override;
72 71
72 // 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
73 // constructor/destructor because it may cause other, unrelated classes,
74 // (ie PanelLayoutManager) to make indirect calls to
75 // restoring_minimized_windows() on a partially constructed/destructed object.
76
77 // Initialize with the windows that can be selected.
78 void Init(const WindowList& windows);
79 // 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.
80 void Shutdown();
81
73 // Cancels window selection. 82 // Cancels window selection.
74 void CancelSelection(); 83 void CancelSelection();
75 84
76 // Called when the last window selector item from a grid is deleted. 85 // Called when the last window selector item from a grid is deleted.
77 void OnGridEmpty(WindowGrid* grid); 86 void OnGridEmpty(WindowGrid* grid);
78 87
88 bool restoring_minimized_windows() const {
89 return restoring_minimized_windows_;
90 }
91
79 // gfx::DisplayObserver: 92 // gfx::DisplayObserver:
80 void OnDisplayAdded(const gfx::Display& display) override; 93 void OnDisplayAdded(const gfx::Display& display) override;
81 void OnDisplayRemoved(const gfx::Display& display) override; 94 void OnDisplayRemoved(const gfx::Display& display) override;
82 void OnDisplayMetricsChanged(const gfx::Display& display, 95 void OnDisplayMetricsChanged(const gfx::Display& display,
83 uint32_t metrics) override; 96 uint32_t metrics) override;
84 97
85 // aura::WindowObserver: 98 // aura::WindowObserver:
86 void OnWindowAdded(aura::Window* new_window) override; 99 void OnWindowAdded(aura::Window* new_window) override;
87 void OnWindowDestroying(aura::Window* window) override; 100 void OnWindowDestroying(aura::Window* window) override;
88 101
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 // such as enter key to select. 175 // such as enter key to select.
163 scoped_ptr<views::Widget> text_filter_widget_; 176 scoped_ptr<views::Widget> text_filter_widget_;
164 177
165 // The current length of the string entered into the text filtering textfield. 178 // The current length of the string entered into the text filtering textfield.
166 size_t text_filter_string_length_; 179 size_t text_filter_string_length_;
167 180
168 // The number of times the text filtering textfield has been cleared of text 181 // The number of times the text filtering textfield has been cleared of text
169 // during this overview mode session. 182 // during this overview mode session.
170 size_t num_times_textfield_cleared_; 183 size_t num_times_textfield_cleared_;
171 184
185 // Tracks whether minimized windows are currently being restored for overview
186 // mode.
187 bool restoring_minimized_windows_;
188
172 DISALLOW_COPY_AND_ASSIGN(WindowSelector); 189 DISALLOW_COPY_AND_ASSIGN(WindowSelector);
173 }; 190 };
174 191
175 } // namespace ash 192 } // namespace ash
176 193
177 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_ 194 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698