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

Unified Diff: ash/wm/dock/docked_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 (nits) 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
« no previous file with comments | « ash/wm/dock/docked_window_layout_manager.cc ('k') | ash/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/dock/docked_window_resizer.h
diff --git a/ash/wm/dock/docked_window_resizer.h b/ash/wm/dock/docked_window_resizer.h
index 75c6071e45ad7edf991a6e918fc112375a2e05ed..6614e2da3ba2fc6415dd95a72d7a8cd4b60315b5 100644
--- a/ash/wm/dock/docked_window_resizer.h
+++ b/ash/wm/dock/docked_window_resizer.h
@@ -35,24 +35,19 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer {
// returned object. The ownership of |next_window_resizer| is taken by the
// returned object. Returns NULL if not resizable.
static DockedWindowResizer* 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 DockWindowResizer that adds the ability to attach / detach
// windows to / from the dock. This object takes ownership of
// |next_window_resizer|.
DockedWindowResizer(WindowResizer* next_window_resizer,
- const Details& details);
+ wm::WindowState* window_state);
// If the provided window bounds should snap to the side of a screen,
// returns the offset that gives the necessary adjustment to snap.
@@ -75,8 +70,6 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer {
DockedAction MaybeReparentWindowOnDragCompletion(bool is_resized,
bool is_attached_panel);
- const Details details_;
-
gfx::Point last_location_;
// Wraps a window resizer and adds detaching / reattaching during drags.
« no previous file with comments | « ash/wm/dock/docked_window_layout_manager.cc ('k') | ash/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698