| 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 b1589bd7110a0fe7075187a23e3de42be684962e..e89be0d814d2f95e5d2755be840add5de1ac2d82 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager.h
|
| +++ b/ash/wm/dock/docked_window_layout_manager.h
|
| @@ -8,7 +8,6 @@
|
| #include <memory>
|
|
|
| #include "ash/ash_export.h"
|
| -#include "ash/shelf/shelf_layout_manager_observer.h"
|
| #include "ash/shell_observer.h"
|
| #include "ash/snap_to_pixel_layout_manager.h"
|
| #include "ash/wm/dock/dock_types.h"
|
| @@ -41,7 +40,6 @@ class DockedBackgroundWidget;
|
| class DockedWindowLayoutManagerObserver;
|
| class DockedWindowResizerTest;
|
| class Shelf;
|
| -class ShelfLayoutManager;
|
| class WorkspaceController;
|
|
|
| struct WindowWithHeight {
|
| @@ -72,7 +70,6 @@ class ASH_EXPORT DockedWindowLayoutManager
|
| public aura::WindowObserver,
|
| public aura::client::ActivationChangeObserver,
|
| public keyboard::KeyboardControllerObserver,
|
| - public ShelfLayoutManagerObserver,
|
| public wm::WindowStateObserver {
|
| public:
|
| // Maximum width of the docked windows area.
|
| @@ -163,10 +160,6 @@ class ASH_EXPORT DockedWindowLayoutManager
|
| aura::Window* root_window) override;
|
| void OnShelfAlignmentChanged(aura::Window* root_window) override;
|
|
|
| - // ShelfLayoutManagerObserver:
|
| - void OnBackgroundUpdated(ShelfBackgroundType background_type,
|
| - BackgroundAnimatorChangeType change_type) override;
|
| -
|
| // wm::WindowStateObserver:
|
| void OnPreWindowStateTypeChange(wm::WindowState* window_state,
|
| wm::WindowStateType old_type) override;
|
|
|