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

Unified Diff: ash/wm/overview/window_grid.h

Issue 2895713002: [mus+ash] Removes WmWindow from ash/wm/mru_window_tracker and overview mode (Closed)
Patch Set: Address nits, unit_tests target compiles Created 3 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 side-by-side diff with in-line comments
Download patch
Index: ash/wm/overview/window_grid.h
diff --git a/ash/wm/overview/window_grid.h b/ash/wm/overview/window_grid.h
index e7d711527df095b9696cb2bd0a0c05c3aff02504..a0352d94aa4eb33af44d92b458b102127f1b3dfa 100644
--- a/ash/wm/overview/window_grid.h
+++ b/ash/wm/overview/window_grid.h
@@ -50,8 +50,8 @@ class WindowSelectorItem;
class ASH_EXPORT WindowGrid : public aura::WindowObserver,
public wm::WindowStateObserver {
public:
- WindowGrid(WmWindow* root_window,
- const std::vector<WmWindow*>& window_list,
+ WindowGrid(aura::Window* root_window,
+ const std::vector<aura::Window*>& window_list,
WindowSelector* window_selector);
~WindowGrid() override;
@@ -86,7 +86,7 @@ class ASH_EXPORT WindowGrid : public aura::WindowObserver,
// Returns true if a window is contained in any of the WindowSelectorItems
// this grid owns.
- bool Contains(const WmWindow* window) const;
+ bool Contains(const aura::Window* window) const;
// Dims the items whose titles do not contain |pattern| and prevents their
// selection. The pattern has its accents removed and is converted to
@@ -109,7 +109,7 @@ class ASH_EXPORT WindowGrid : public aura::WindowObserver,
bool is_selecting() const { return selection_widget_ != nullptr; }
// Returns the root window in which the grid displays the windows.
- const WmWindow* root_window() const { return root_window_; }
+ const aura::Window* root_window() const { return root_window_; }
const std::vector<std::unique_ptr<WindowSelectorItem>>& window_list() const {
return window_list_;
@@ -161,7 +161,7 @@ class ASH_EXPORT WindowGrid : public aura::WindowObserver,
int* max_right);
// Root window the grid is in.
- WmWindow* root_window_;
+ aura::Window* root_window_;
// Pointer to the window selector that spawned this grid.
WindowSelector* window_selector_;

Powered by Google App Engine
This is Rietveld 408576698