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

Unified Diff: ash/common/wm/overview/window_selector_item.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_selector.cc ('k') | ash/common/wm/overview/window_selector_item.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_item.h
diff --git a/ash/common/wm/overview/window_selector_item.h b/ash/common/wm/overview/window_selector_item.h
index 2d8759829352f205840eba1f6eb17613f9370b95..097cc8b4971a22f2724f07bae45bb846b2e8a60d 100644
--- a/ash/common/wm/overview/window_selector_item.h
+++ b/ash/common/wm/overview/window_selector_item.h
@@ -9,8 +9,8 @@
#include "ash/ash_export.h"
#include "ash/common/wm/overview/scoped_transform_overview_window.h"
-#include "ash/common/wm_window_observer.h"
#include "base/macros.h"
+#include "ui/aura/window_observer.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/views/controls/button/button.h"
@@ -33,7 +33,7 @@ class WmWindow;
// This class represents an item in overview mode.
class ASH_EXPORT WindowSelectorItem : public views::ButtonListener,
- public WmWindowObserver {
+ public aura::WindowObserver {
public:
// An image button with a close window icon.
class OverviewCloseButton : public views::ImageButton {
@@ -117,9 +117,9 @@ class ASH_EXPORT WindowSelectorItem : public views::ButtonListener,
// views::ButtonListener:
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
- // WmWindowObserver:
- void OnWindowDestroying(WmWindow* window) override;
- void OnWindowTitleChanged(WmWindow* window) override;
+ // aura::WindowObserver:
+ void OnWindowDestroying(aura::Window* window) override;
+ void OnWindowTitleChanged(aura::Window* window) override;
private:
class CaptionContainerView;
« no previous file with comments | « ash/common/wm/overview/window_selector.cc ('k') | ash/common/wm/overview/window_selector_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698