| Index: ash/shelf/shelf_view.h
|
| diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
|
| index 6cd44e01af3cc6ccaeaedb306f0301ce6de470a4..0d6f0b75eb197d93142009fa533d654fc9e7cbab 100644
|
| --- a/ash/shelf/shelf_view.h
|
| +++ b/ash/shelf/shelf_view.h
|
| @@ -27,19 +27,11 @@ class ViewModel;
|
| }
|
|
|
| namespace ash {
|
| -
|
| -namespace test {
|
| -class ShelfViewTestAPI;
|
| -}
|
| -
|
| class ShelfDelegate;
|
| class ShelfIconObserver;
|
| class ShelfItemDelegateManager;
|
| class ShelfModel;
|
| struct ShelfItem;
|
| -
|
| -namespace internal {
|
| -
|
| class DragImageView;
|
| class OverflowBubble;
|
| class OverflowButton;
|
| @@ -47,6 +39,10 @@ class ShelfButton;
|
| class ShelfLayoutManager;
|
| class ShelfTooltipManager;
|
|
|
| +namespace test {
|
| +class ShelfViewTestAPI;
|
| +}
|
| +
|
| extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM;
|
| extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT;
|
| extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT;
|
| @@ -420,7 +416,7 @@ class ASH_EXPORT ShelfView : public views::View,
|
|
|
| // The image proxy for drag operations when a drag and drop host exists and
|
| // the item can be dragged outside the app grid.
|
| - scoped_ptr<ash::internal::DragImageView> drag_image_;
|
| + scoped_ptr<ash::DragImageView> drag_image_;
|
|
|
| // The cursor offset to the middle of the dragged item.
|
| gfx::Vector2d drag_image_offset_;
|
| @@ -452,7 +448,6 @@ class ASH_EXPORT ShelfView : public views::View,
|
| DISALLOW_COPY_AND_ASSIGN(ShelfView);
|
| };
|
|
|
| -} // namespace internal
|
| } // namespace ash
|
|
|
| #endif // ASH_SHELF_SHELF_VIEW_H_
|
|
|