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

Unified Diff: ash/wm/panels/panel_window_resizer.h

Issue 121153003: Prevents panels attached to shelf from docking (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevents panels attached to shelf from docking (comments) Created 6 years, 11 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
Index: ash/wm/panels/panel_window_resizer.h
diff --git a/ash/wm/panels/panel_window_resizer.h b/ash/wm/panels/panel_window_resizer.h
index 9a1b69ce6ac0982bbbed166a28930fca370bc087..4f087b8c64bcef319b4b5666321eb5aec42fb2d0 100644
--- a/ash/wm/panels/panel_window_resizer.h
+++ b/ash/wm/panels/panel_window_resizer.h
@@ -27,17 +27,12 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer {
// returned object. The ownership of |next_window_resizer| is taken by the
// returned object. Returns NULL if not resizable.
static PanelWindowResizer* Create(WindowResizer* next_window_resizer,
- aura::Window* window,
- const gfx::Point& location,
- int window_component,
- aura::client::WindowMoveSource source);
+ wm::WindowState* window_state);
// WindowResizer:
virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE;
virtual void CompleteDrag() OVERRIDE;
virtual void RevertDrag() OVERRIDE;
- virtual aura::Window* GetTarget() OVERRIDE;
- virtual const gfx::Point& GetInitialLocation() const OVERRIDE;
private:
// Creates PanelWindowResizer that adds the ability to attach / detach panel
@@ -45,7 +40,7 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer {
// |next_window_resizer|. This object takes ownership of
// |next_window_resizer|.
PanelWindowResizer(WindowResizer* next_window_resizer,
- const Details& details);
+ wm::WindowState* window_state);
// Checks if the provided window bounds should attach to the launcher. If true
// the offset gives the necessary adjustment to snap to the launcher.
@@ -62,8 +57,6 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer {
// Updates the dragged panel's index in the launcher.
void UpdateLauncherPosition();
- const Details details_;
-
// Last pointer location in screen coordinates.
gfx::Point last_location_;
@@ -81,9 +74,6 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer {
// True if the window started attached to the launcher.
const bool was_attached_;
- // True if the window should attach to the launcher after releasing.
- bool should_attach_;
-
base::WeakPtrFactory<PanelWindowResizer> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(PanelWindowResizer);

Powered by Google App Engine
This is Rietveld 408576698