| Index: ash/mus/shelf_layout_manager.h
|
| diff --git a/ash/mus/shelf_layout_manager.h b/ash/mus/shelf_layout_manager.h
|
| index 8cca50a077acf81c2e5a58d2f816f5174bdd1060..3f96571064ead55606557327c8c8483dba5633ef 100644
|
| --- a/ash/mus/shelf_layout_manager.h
|
| +++ b/ash/mus/shelf_layout_manager.h
|
| @@ -17,11 +17,11 @@ class ShelfLayoutManagerDelegate;
|
| // Lays out the shelf within shelf containers.
|
| class ShelfLayoutManager : public LayoutManager {
|
| public:
|
| - ShelfLayoutManager(::ui::Window* owner, ShelfLayoutManagerDelegate* delegate);
|
| + ShelfLayoutManager(ui::Window* owner, ShelfLayoutManagerDelegate* delegate);
|
| ~ShelfLayoutManager() override;
|
|
|
| // Returns the shelf, which may be null.
|
| - ::ui::Window* GetShelfWindow();
|
| + ui::Window* GetShelfWindow();
|
|
|
| void SetAlignment(mash::shelf::mojom::Alignment alignment);
|
| void SetAutoHideBehavior(mash::shelf::mojom::AutoHideBehavior auto_hide);
|
| @@ -33,8 +33,8 @@ class ShelfLayoutManager : public LayoutManager {
|
|
|
| private:
|
| // Overridden from LayoutManager:
|
| - void LayoutWindow(::ui::Window* window) override;
|
| - void WindowAdded(::ui::Window* window) override;
|
| + void LayoutWindow(ui::Window* window) override;
|
| + void WindowAdded(ui::Window* window) override;
|
|
|
| ShelfLayoutManagerDelegate* delegate_;
|
| mash::shelf::mojom::Alignment alignment_;
|
|
|