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

Unified Diff: ash/common/wm/workspace_controller.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/workspace/workspace_window_resizer.cc ('k') | ash/common/wm/workspace_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/workspace_controller.h
diff --git a/ash/common/wm/workspace_controller.h b/ash/common/wm/workspace_controller.h
index 2004810df04e3bcb610b09c3b9030b7c2741888a..d37fe682b4ba647ec5412a10444598a79c44a933 100644
--- a/ash/common/wm/workspace_controller.h
+++ b/ash/common/wm/workspace_controller.h
@@ -9,8 +9,8 @@
#include "ash/ash_export.h"
#include "ash/common/wm/workspace/workspace_types.h"
-#include "ash/common/wm_window_observer.h"
#include "base/macros.h"
+#include "ui/aura/window_observer.h"
namespace ash {
class WmWindow;
@@ -21,7 +21,7 @@ class WorkspaceLayoutManagerBackdropDelegate;
// WorkspaceController acts as a central place that ties together all the
// various workspace pieces.
-class ASH_EXPORT WorkspaceController : public WmWindowObserver {
+class ASH_EXPORT WorkspaceController : public aura::WindowObserver {
public:
// Installs WorkspaceLayoutManager on |viewport|.
explicit WorkspaceController(WmWindow* viewport);
@@ -43,8 +43,8 @@ class ASH_EXPORT WorkspaceController : public WmWindowObserver {
private:
friend class WorkspaceControllerTestHelper;
- // WmWindowObserver:
- void OnWindowDestroying(WmWindow* window) override;
+ // aura::WindowObserver:
+ void OnWindowDestroying(aura::Window* window) override;
WmWindow* viewport_;
std::unique_ptr<WorkspaceEventHandler> event_handler_;
« no previous file with comments | « ash/common/wm/workspace/workspace_window_resizer.cc ('k') | ash/common/wm/workspace_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698