| Index: ash/wm/dock/docked_window_layout_manager.h
|
| diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h
|
| index e4542b357cd270b8c0e202cd0000c56afb345d27..8bea76386afd8cf0f9874aadba17d2e1684698e0 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager.h
|
| +++ b/ash/wm/dock/docked_window_layout_manager.h
|
| @@ -9,7 +9,6 @@
|
| #include "ash/shelf/shelf_layout_manager_observer.h"
|
| #include "ash/shell_observer.h"
|
| #include "ash/wm/dock/dock_types.h"
|
| -#include "ash/wm/property_util.h"
|
| #include "ash/wm/workspace/snap_types.h"
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| @@ -163,8 +162,8 @@ class ASH_EXPORT DockedWindowLayoutManager
|
| static const int kMinDockGap;
|
|
|
| // Minimize / restore window and relayout.
|
| - void MinimizeWindow(aura::Window* window);
|
| - void RestoreWindow(aura::Window* window);
|
| + void MinimizeDockedWindow(aura::Window* window);
|
| + void RestoreDockedWindow(aura::Window* window);
|
|
|
| // Updates docked layout state when a window gets inside the dock.
|
| void OnWindowDocked(aura::Window* window);
|
|
|