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

Unified Diff: ash/common/wallpaper/wallpaper_widget_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/test/test_shelf_delegate.cc ('k') | ash/common/wallpaper/wallpaper_widget_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wallpaper/wallpaper_widget_controller.h
diff --git a/ash/common/wallpaper/wallpaper_widget_controller.h b/ash/common/wallpaper/wallpaper_widget_controller.h
index d125cafaae1eb4b93f4a769dd9a1908e5655bff9..f0c33788374c7134ad6eb6dbcd46cc37e3971c3b 100644
--- a/ash/common/wallpaper/wallpaper_widget_controller.h
+++ b/ash/common/wallpaper/wallpaper_widget_controller.h
@@ -8,8 +8,8 @@
#include <memory>
#include "ash/ash_export.h"
-#include "ash/common/wm_window_observer.h"
#include "base/macros.h"
+#include "ui/aura/window_observer.h"
#include "ui/views/widget/widget_observer.h"
namespace ash {
@@ -22,7 +22,7 @@ class WmWindow;
// When the animation completes the old WallpaperWidgetController is
// destroyed. Exported for tests.
class ASH_EXPORT WallpaperWidgetController : public views::WidgetObserver,
- public WmWindowObserver {
+ public aura::WindowObserver {
public:
explicit WallpaperWidgetController(views::Widget* widget);
~WallpaperWidgetController() override;
@@ -48,8 +48,8 @@ class ASH_EXPORT WallpaperWidgetController : public views::WidgetObserver,
private:
void RemoveObservers();
- // WmWindowObserver:
- void OnWindowBoundsChanged(WmWindow* window,
+ // aura::WindowObserver:
+ void OnWindowBoundsChanged(aura::Window* window,
const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) override;
« no previous file with comments | « ash/common/test/test_shelf_delegate.cc ('k') | ash/common/wallpaper/wallpaper_widget_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698