| Index: ash/common/shelf/shelf.h
|
| diff --git a/ash/common/shelf/shelf.h b/ash/common/shelf/shelf.h
|
| index 233a5065242c88fe6c2f998844ee4c1755550520..066e124356b8bd8180c7a07b979c22e9dacff964 100644
|
| --- a/ash/common/shelf/shelf.h
|
| +++ b/ash/common/shelf/shelf.h
|
| @@ -9,16 +9,11 @@
|
| #include "ash/common/shelf/shelf_widget.h"
|
| #include "base/macros.h"
|
|
|
| -namespace app_list {
|
| -class ApplicationDragAndDropHost;
|
| -}
|
| -
|
| namespace gfx {
|
| class Rect;
|
| }
|
|
|
| namespace ash {
|
| -class AppListButton;
|
| class ShelfView;
|
| class WmShelf;
|
|
|
| @@ -48,8 +43,6 @@ class ASH_EXPORT Shelf {
|
| // TODO(jamescook): Remove this.
|
| WmShelf* wm_shelf() { return wm_shelf_; }
|
|
|
| - AppListButton* GetAppListButton() const;
|
| -
|
| ShelfWidget* shelf_widget() { return shelf_widget_; }
|
|
|
| // TODO(msw): ShelfLayoutManager should not be accessed externally.
|
| @@ -57,9 +50,6 @@ class ASH_EXPORT Shelf {
|
| return shelf_widget_->shelf_layout_manager();
|
| }
|
|
|
| - // Returns ApplicationDragAndDropHost for this shelf.
|
| - app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
|
| -
|
| ShelfView* shelf_view_for_testing() { return shelf_view_; }
|
|
|
| private:
|
|
|