| Index: ash/wm/panels/panel_layout_manager.h
|
| diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h
|
| index 042d285cb1d60071b4674ad0c5d39ec2aae5224f..71d22d256a65c70a014dd621a81fd80ce461c70e 100644
|
| --- a/ash/wm/panels/panel_layout_manager.h
|
| +++ b/ash/wm/panels/panel_layout_manager.h
|
| @@ -37,7 +37,7 @@ class Widget;
|
| }
|
|
|
| namespace ash {
|
| -class Launcher;
|
| +class Shelf;
|
|
|
| namespace internal {
|
| class PanelCalloutWidget;
|
| @@ -77,8 +77,8 @@ class ASH_EXPORT PanelLayoutManager
|
| // Returns the callout widget (arrow) for |panel|.
|
| views::Widget* GetCalloutWidgetForPanel(aura::Window* panel);
|
|
|
| - ash::Launcher* launcher() { return launcher_; }
|
| - void SetLauncher(ash::Launcher* launcher);
|
| + Shelf* shelf() { return shelf_; }
|
| + void SetShelf(Shelf* shelf);
|
|
|
| // Overridden from aura::LayoutManager:
|
| virtual void OnWindowResized() OVERRIDE;
|
| @@ -172,8 +172,8 @@ class ASH_EXPORT PanelLayoutManager
|
| PanelList panel_windows_;
|
| // The panel being dragged.
|
| aura::Window* dragged_panel_;
|
| - // The launcher we are observing for launcher icon changes.
|
| - Launcher* launcher_;
|
| + // The shelf we are observing for shelf icon changes.
|
| + Shelf* shelf_;
|
| // The shelf layout manager being observed for visibility changes.
|
| ShelfLayoutManager* shelf_layout_manager_;
|
|
|
|
|