| Index: ash/wm/workspace/frame_maximize_button.h
|
| diff --git a/ash/wm/workspace/frame_maximize_button.h b/ash/wm/workspace/frame_maximize_button.h
|
| index f01df6c267aa36ae9dc85fd14a337e6afc30697a..8d0bfec64cedece829338e5ca0ab7da2a7507de5 100644
|
| --- a/ash/wm/workspace/frame_maximize_button.h
|
| +++ b/ash/wm/workspace/frame_maximize_button.h
|
| @@ -22,7 +22,6 @@ namespace ash {
|
|
|
| namespace internal {
|
| class PhantomWindowController;
|
| -class SnapSizer;
|
| }
|
|
|
| class MaximizeBubbleController;
|
| @@ -114,26 +113,17 @@ class ASH_EXPORT FrameMaximizeButton : public views::ImageButton,
|
| // |update_timer_|.
|
| void UpdateSnapFromEventLocation();
|
|
|
| - // Updates |snap_type_| based on a mouse drag. If |select_default| is set,
|
| - // the single button click default setting of the snap sizer should be used.
|
| - // Set |is_touch| to true to make touch snapping at the corners possible.
|
| - void UpdateSnap(const gfx::Point& location,
|
| - bool select_default,
|
| - bool is_touch);
|
| + // Updates |snap_type_| based on a mouse drag.
|
| + void UpdateSnap(const gfx::Point& location);
|
|
|
| // Returns the type of snap based on the specified location.
|
| SnapType SnapTypeForLocation(const gfx::Point& location) const;
|
|
|
| // Returns the bounds of the resulting window for the specified type.
|
| - gfx::Rect ScreenBoundsForType(SnapType type,
|
| - const internal::SnapSizer& snap_sizer) const;
|
| -
|
| - // Converts location to screen coordinates and returns it. These are the
|
| - // coordinates used by the SnapSizer.
|
| - gfx::Point LocationForSnapSizer(const gfx::Point& location) const;
|
| + gfx::Rect ScreenBoundsForType(SnapType type) const;
|
|
|
| // Snaps the window to the current snap position.
|
| - void Snap(const internal::SnapSizer& snap_sizer);
|
| + void Snap();
|
|
|
| // Determine the maximize type of this window.
|
| MaximizeBubbleFrameState GetMaximizeBubbleFrameState() const;
|
| @@ -164,8 +154,6 @@ class ASH_EXPORT FrameMaximizeButton : public views::ImageButton,
|
| // Current snap type.
|
| SnapType snap_type_;
|
|
|
| - scoped_ptr<internal::SnapSizer> snap_sizer_;
|
| -
|
| scoped_ptr<EscapeEventFilter> escape_event_filter_;
|
|
|
| base::OneShotTimer<FrameMaximizeButton> update_timer_;
|
|
|