| Index: ash/wm/workspace/multi_window_resize_controller.h
|
| diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h
|
| index 94ed53473bbea502c2781198f1938ea8c320aed8..ac9f4faf3db3bb089cf9c3f4d28b0c44faae1de8 100644
|
| --- a/ash/wm/workspace/multi_window_resize_controller.h
|
| +++ b/ash/wm/workspace/multi_window_resize_controller.h
|
| @@ -87,6 +87,8 @@ class ASH_EXPORT MultiWindowResizeController :
|
| class ResizeMouseWatcherHost;
|
| class ResizeView;
|
|
|
| + void CreateMouseWatcher();
|
| +
|
| // Returns a ResizeWindows based on the specified arguments. Use is_valid()
|
| // to test if the return value is a valid multi window resize location.
|
| ResizeWindows DetermineWindows(aura::Window* window,
|
| @@ -112,9 +114,6 @@ class ASH_EXPORT MultiWindowResizeController :
|
| Direction direction,
|
| std::vector<aura::Window*>* others) const;
|
|
|
| - // Hides the window after a delay.
|
| - void DelayedHide();
|
| -
|
| // Shows the resizer if the mouse is still at a valid location. This is called
|
| // from the |show_timer_|.
|
| void ShowIfValidMouseLocation();
|
| @@ -145,17 +144,14 @@ class ASH_EXPORT MultiWindowResizeController :
|
| // (or the resize widget itself).
|
| bool IsOverWindows(const gfx::Point& location_in_screen) const;
|
|
|
| - // Returns true if |location_in_screen| is over |window|.
|
| - bool IsOverWindow(aura::Window* window,
|
| - const gfx::Point& location_in_screen,
|
| - int component) const;
|
| + // Returns true if |location_in_screen| is over |component| in |window|.
|
| + bool IsOverComponent(aura::Window* window,
|
| + const gfx::Point& location_in_screen,
|
| + int component) const;
|
|
|
| // Windows and direction to resize.
|
| ResizeWindows windows_;
|
|
|
| - // Timer before hiding.
|
| - base::OneShotTimer<MultiWindowResizeController> hide_timer_;
|
| -
|
| // Timer used before showing.
|
| base::OneShotTimer<MultiWindowResizeController> show_timer_;
|
|
|
|
|