| Index: ui/aura_shell/desktop_layout_manager.h
|
| diff --git a/ui/aura_shell/desktop_layout_manager.h b/ui/aura_shell/desktop_layout_manager.h
|
| index 7af3039e4bf303cf539c81533bf7ca969d3d4b05..80efb19f809c636bf7b935592ab611da68bee409 100644
|
| --- a/ui/aura_shell/desktop_layout_manager.h
|
| +++ b/ui/aura_shell/desktop_layout_manager.h
|
| @@ -23,8 +23,6 @@ class Widget;
|
| namespace aura_shell {
|
| namespace internal {
|
|
|
| -class ShelfLayoutController;
|
| -
|
| // A layout manager for the root window.
|
| // Resizes all of its immediate children to fill the bounds of the root window.
|
| class DesktopLayoutManager : public aura::LayoutManager {
|
| @@ -32,8 +30,6 @@ class DesktopLayoutManager : public aura::LayoutManager {
|
| explicit DesktopLayoutManager(aura::Window* owner);
|
| virtual ~DesktopLayoutManager();
|
|
|
| - void set_shelf(ShelfLayoutController* shelf) { shelf_ = shelf; }
|
| -
|
| void set_background_widget(views::Widget* background_widget) {
|
| background_widget_ = background_widget;
|
| }
|
| @@ -52,8 +48,6 @@ class DesktopLayoutManager : public aura::LayoutManager {
|
|
|
| views::Widget* background_widget_;
|
|
|
| - ShelfLayoutController* shelf_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(DesktopLayoutManager);
|
| };
|
|
|
|
|