| Index: ash/shelf/shelf.h
|
| diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
|
| index 03cc2b0ef8cff2f5f24a11ebcaae01ad51f80871..2b06d8288e2cd3bf0b15d81651ee18bc85d9884f 100644
|
| --- a/ash/shelf/shelf.h
|
| +++ b/ash/shelf/shelf.h
|
| @@ -30,21 +30,18 @@ class View;
|
| }
|
|
|
| namespace ash {
|
| -
|
| -namespace internal {
|
| class FocusCycler;
|
| +class ShelfDelegate;
|
| +class ShelfIconObserver;
|
| class ShelfLayoutManager;
|
| +class ShelfModel;
|
| class ShelfView;
|
| -}
|
| +class ShelfWidget;
|
|
|
| namespace test {
|
| class ShelfTestAPI;
|
| }
|
|
|
| -class ShelfDelegate;
|
| -class ShelfIconObserver;
|
| -class ShelfModel;
|
| -class ShelfWidget;
|
|
|
| class ASH_EXPORT Shelf {
|
| public:
|
| @@ -115,7 +112,7 @@ class ASH_EXPORT Shelf {
|
| friend class test::ShelfTestAPI;
|
|
|
| // ShelfView used to display icons.
|
| - internal::ShelfView* shelf_view_;
|
| + ShelfView* shelf_view_;
|
|
|
| ShelfAlignment alignment_;
|
|
|
|
|