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

Unified Diff: ash/drag_drop/drag_drop_controller.h

Issue 2206033002: mash: Migrate ash::DragImageView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 4 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/drag_drop/drag_image_view.cc ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_controller.h
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
index dbe26583ff3c53a2f5098ef8146391c5aaf8223c..fcd114d7b840aa08ce405a7c064513ad44263c03 100644
--- a/ash/drag_drop/drag_drop_controller.h
+++ b/ash/drag_drop/drag_drop_controller.h
@@ -8,6 +8,7 @@
#include <memory>
#include "ash/ash_export.h"
+#include "ash/common/wm_display_observer.h"
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -35,7 +36,8 @@ class DragDropControllerTest;
class ASH_EXPORT DragDropController : public aura::client::DragDropClient,
public ui::EventHandler,
public gfx::AnimationDelegate,
- public aura::WindowObserver {
+ public aura::WindowObserver,
+ public WmDisplayObserver {
public:
DragDropController();
~DragDropController() override;
@@ -85,6 +87,9 @@ class ASH_EXPORT DragDropController : public aura::client::DragDropClient,
void AnimationProgressed(const gfx::Animation* animation) override;
void AnimationCanceled(const gfx::Animation* animation) override;
+ // WmDisplayObserver:
+ void OnDisplayConfigurationChanging() override;
+
// Helper method to start drag widget flying back animation.
void StartCanceledAnimation(int animation_duration_ms);
« no previous file with comments | « ash/common/drag_drop/drag_image_view.cc ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698