| Index: ui/aura_shell/default_container_layout_manager.h
|
| diff --git a/ui/aura_shell/default_container_layout_manager.h b/ui/aura_shell/default_container_layout_manager.h
|
| index 53cd0d146cb7dd9941adcceb0d388084fa1f15d0..cf2fe9dbe1c6db20073cdf8eb7a9f92e01507176 100644
|
| --- a/ui/aura_shell/default_container_layout_manager.h
|
| +++ b/ui/aura_shell/default_container_layout_manager.h
|
| @@ -21,16 +21,16 @@ class Rect;
|
| }
|
|
|
| namespace aura_shell {
|
| -class WorkspaceManager;
|
| -
|
| namespace internal {
|
|
|
| +class WorkspaceManager;
|
| +
|
| // LayoutManager for the default window container.
|
| class AURA_SHELL_EXPORT DefaultContainerLayoutManager
|
| : public aura::LayoutManager {
|
| public:
|
| - DefaultContainerLayoutManager(
|
| - aura::Window* owner, WorkspaceManager* workspace_manager);
|
| + DefaultContainerLayoutManager(aura::Window* owner,
|
| + WorkspaceManager* workspace_manager);
|
| virtual ~DefaultContainerLayoutManager();
|
|
|
| // Invoked when a window receives drag event.
|
| @@ -48,6 +48,12 @@ class AURA_SHELL_EXPORT DefaultContainerLayoutManager
|
| // Invoked when a user finished resizing window.
|
| void EndResize(aura::Window* drag, aura::MouseEvent* evnet);
|
|
|
| + // If true, |CalculateBoundsForChild| does nothing. Use in situations where
|
| + // you want to circumvent what CalculateBoundsForChild() would normally do.
|
| + void set_ignore_calculate_bounds(bool value) {
|
| + ignore_calculate_bounds_ = value;
|
| + }
|
| +
|
| // Overridden from aura::LayoutManager:
|
| virtual void OnWindowResized() OVERRIDE;
|
| virtual void OnWindowAdded(aura::Window* child) OVERRIDE;
|
|
|