| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index e2018f8eaa181fd9f452a39f03aa242b07b1bb37..bc32fa899993e0d3f5e45cbbe29d490dbca0a4e6 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -11,6 +11,7 @@
|
| #include "ash/shelf/shelf_types.h"
|
| #include "ash/shell_observer.h"
|
| #include "ash/system/status_area_widget.h"
|
| +#include "ash/wm/dock/dock_observer.h"
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/logging.h"
|
| @@ -52,6 +53,7 @@ class ASH_EXPORT ShelfLayoutManager :
|
| public aura::LayoutManager,
|
| public ash::ShellObserver,
|
| public aura::client::ActivationChangeObserver,
|
| + public DockObserver,
|
| public keyboard::KeyboardControllerObserver {
|
| public:
|
|
|
| @@ -281,6 +283,9 @@ class ASH_EXPORT ShelfLayoutManager :
|
| virtual void OnKeyboardBoundsChanging(
|
| const gfx::Rect& keyboard_bounds) OVERRIDE;
|
|
|
| + // Overridden from dock::DockObserver:
|
| + virtual void OnDockBoundsChanging(const gfx::Rect& dock_bounds) OVERRIDE;
|
| +
|
| // Generates insets for inward edge based on the current shelf alignment.
|
| gfx::Insets GetInsetsForAlignment(int distance) const;
|
|
|
| @@ -340,6 +345,9 @@ class ASH_EXPORT ShelfLayoutManager :
|
| // The bounds of the keyboard.
|
| gfx::Rect keyboard_bounds_;
|
|
|
| + // The bounds of the dock.
|
| + gfx::Rect dock_bounds_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
|
| };
|
|
|
|
|