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

Unified Diff: ash/common/wm/overview/window_selector.h

Issue 2699033002: Replace WmWindowObserver with aura::WindowObserver. (Closed)
Patch Set: Check for null images in ShelfWindowWatcher. Created 3 years, 10 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
« no previous file with comments | « ash/common/wm/overview/window_grid.cc ('k') | ash/common/wm/overview/window_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/overview/window_selector.h
diff --git a/ash/common/wm/overview/window_selector.h b/ash/common/wm/overview/window_selector.h
index 5512f4d89e89d595cabd0ec98c9bbea8c8451575..a5cb74386e85c081ecb2aa3dd8cc009bc8a9c381 100644
--- a/ash/common/wm/overview/window_selector.h
+++ b/ash/common/wm/overview/window_selector.h
@@ -14,9 +14,9 @@
#include "ash/ash_export.h"
#include "ash/common/wm_activation_observer.h"
-#include "ash/common/wm_window_observer.h"
#include "base/macros.h"
#include "base/time/time.h"
+#include "ui/aura/window_observer.h"
#include "ui/display/display_observer.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/views/controls/textfield/textfield_controller.h"
@@ -35,7 +35,7 @@ class WindowGrid;
// The WindowSelector shows a grid of all of your windows, allowing to select
// one by clicking or tapping on it.
class ASH_EXPORT WindowSelector : public display::DisplayObserver,
- public WmWindowObserver,
+ public aura::WindowObserver,
public WmActivationObserver,
public views::TextfieldController {
public:
@@ -91,10 +91,9 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
void OnDisplayMetricsChanged(const display::Display& display,
uint32_t metrics) override;
- // WmWindowObserver:
- void OnWindowTreeChanged(WmWindow* window,
- const TreeChangeParams& params) override;
- void OnWindowDestroying(WmWindow* window) override;
+ // aura::WindowObserver:
+ void OnWindowHierarchyChanged(const HierarchyChangeParams& params) override;
+ void OnWindowDestroying(aura::Window* window) override;
// WmActivationObserver
void OnWindowActivated(WmWindow* gained_active,
« no previous file with comments | « ash/common/wm/overview/window_grid.cc ('k') | ash/common/wm/overview/window_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698