| 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 988fa03617504933e668c4fdeaa41370395987c9..83c3cb4e94624005282ca980fc9d28cee489bec0 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager.h
|
| +++ b/ash/wm/dock/docked_window_layout_manager.h
|
| @@ -121,6 +121,9 @@ class ASH_EXPORT DockedWindowLayoutManager
|
| // Used to snap docked windows to the side of screen during drag.
|
| DockedAlignment CalculateAlignment() const;
|
|
|
| + // Set the preferred alignment of the dock
|
| + void SetPreferredAlignment(DockedAlignment preferred_alignment);
|
| +
|
| // Returns true when a window can be docked. Windows cannot be docked at the
|
| // edge used by the shelf or the edge opposite from existing dock.
|
| bool CanDockWindow(aura::Window* window, DockedAlignment desired_alignment);
|
| @@ -302,6 +305,9 @@ class ASH_EXPORT DockedWindowLayoutManager
|
| // Side of the screen that the dock is positioned at.
|
| DockedAlignment alignment_;
|
|
|
| + // The preferred alignment of the next window to be added.
|
| + DockedAlignment preferred_alignment_;
|
| +
|
| // The last active window. Used to maintain stacking order even if no windows
|
| // are currently focused.
|
| aura::Window* last_active_window_;
|
|
|