| 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 8df2dfde55d19e06afe9e009a97a76430a052e35..be3dea8a8f646d4863b34bf69dd3c6ec55e1278c 100644
|
| --- a/ash/wm/panels/panel_window_resizer.h
|
| +++ b/ash/wm/panels/panel_window_resizer.h
|
| @@ -31,15 +31,12 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer {
|
| int window_component,
|
| aura::client::WindowMoveSource source);
|
|
|
| - // 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;
|
| - }
|
| + virtual const gfx::Point& GetInitialLocation() const OVERRIDE;
|
|
|
| private:
|
| // Creates PanelWindowResizer that adds the ability to attach / detach panel
|
| @@ -66,6 +63,9 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer {
|
|
|
| const Details details_;
|
|
|
| + // Last pointer location in screen coordinates.
|
| + 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_;
|
| @@ -89,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_
|
|
|