Chromium Code Reviews| 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 5dbc32d0aea2bd612dbc76b114b23a5e4d368323..52d8b7b0f56a1257ce312819d7d85bfb28271b01 100644 |
| --- a/ash/wm/panels/panel_window_resizer.h |
| +++ b/ash/wm/panels/panel_window_resizer.h |
| @@ -30,17 +30,16 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer { |
| const gfx::Point& location, |
| int window_component); |
| - // WindowResizer overides: |
| + // WindowResizer: |
| virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE; |
| virtual void CompleteDrag(int event_flags) OVERRIDE; |
| virtual void RevertDrag() OVERRIDE; |
| virtual aura::Window* GetTarget() OVERRIDE; |
| - const gfx::Point& GetInitialLocationInParentForTest() const { |
| - return details_.initial_location_in_parent; |
| - } |
| - |
| private: |
| + // WindowResizer: |
| + virtual const gfx::Point& GetInitialLocationForTest() const OVERRIDE; |
|
flackr
2013/06/17 18:49:42
protected
varkha
2013/06/17 19:05:36
Done.
|
| + |
| // Creates PanelWindowResizer that adds the ability to attach / detach panel |
| // windows as well as reparenting them to the panel layer while dragging to |
| // |next_window_resizer|. This object takes ownership of |
| @@ -65,6 +64,8 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer { |
| const Details details_; |
| + gfx::Point last_location_; |
| + |
| // Wraps a window resizer and adds panel detaching / reattaching and snapping |
| // to launcher behavior during drags. |
| scoped_ptr<WindowResizer> next_window_resizer_; |
| @@ -88,6 +89,6 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer { |
| DISALLOW_COPY_AND_ASSIGN(PanelWindowResizer); |
| }; |
| -} // namespace aura |
| +} // namespace ash |
| #endif // ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_ |