| 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 d4b8f354c57965de64d979ec65f29facc5a8f325..94ed53473bbea502c2781198f1938ea8c320aed8 100644
|
| --- a/ash/wm/workspace/multi_window_resize_controller.h
|
| +++ b/ash/wm/workspace/multi_window_resize_controller.h
|
| @@ -87,8 +87,6 @@
|
| 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,
|
| @@ -102,8 +100,8 @@
|
| // Finds a window by edge (one of the constants HitTestCompat.
|
| aura::Window* FindWindowByEdge(aura::Window* window_to_ignore,
|
| int edge_want,
|
| - int x_in_parent,
|
| - int y_in_parent) const;
|
| + int x,
|
| + int y) const;
|
|
|
| // Returns the first window touching |window|.
|
| aura::Window* FindWindowTouching(aura::Window* window,
|
| @@ -113,6 +111,9 @@
|
| void FindWindowsTouching(aura::Window* start,
|
| 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_|.
|
| @@ -144,13 +145,16 @@
|
| // (or the resize widget itself).
|
| bool IsOverWindows(const gfx::Point& location_in_screen) 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;
|
| + // Returns true if |location_in_screen| is over |window|.
|
| + bool IsOverWindow(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_;
|
|
|