| Index: ash/launcher/launcher_view.h
|
| ===================================================================
|
| --- ash/launcher/launcher_view.h (revision 133102)
|
| +++ ash/launcher/launcher_view.h (working copy)
|
| @@ -11,7 +11,6 @@
|
|
|
| #include "ash/launcher/launcher_button_host.h"
|
| #include "ash/launcher/launcher_model_observer.h"
|
| -#include "base/observer_list.h"
|
| #include "ui/views/context_menu_controller.h"
|
| #include "ui/views/controls/button/button.h"
|
| #include "ui/views/focus/focus_manager.h"
|
| @@ -28,7 +27,6 @@
|
|
|
| class LauncherDelegate;
|
| struct LauncherItem;
|
| -class LauncherIconObserver;
|
| class LauncherModel;
|
|
|
| namespace internal {
|
| @@ -68,9 +66,6 @@
|
| // isn't know.
|
| gfx::Rect GetIdealBoundsOfItemIcon(LauncherID id);
|
|
|
| - void AddIconObserver(LauncherIconObserver* observer);
|
| - void RemoveIconObserver(LauncherIconObserver* observer);
|
| -
|
| // Returns true if we're showing a menu.
|
| bool IsShowingMenu() const;
|
|
|
| @@ -174,10 +169,6 @@
|
| // item in |model_|.
|
| scoped_ptr<views::ViewModel> view_model_;
|
|
|
| - // Last index of a launcher button that is visible
|
| - // (does not go into overflow).
|
| - int last_visible_index_;
|
| -
|
| scoped_ptr<views::BoundsAnimator> bounds_animator_;
|
|
|
| views::ImageButton* overflow_button_;
|
| @@ -207,8 +198,6 @@
|
| scoped_ptr<views::MenuRunner> launcher_menu_runner_;
|
| #endif
|
|
|
| - ObserverList<LauncherIconObserver> observers_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(LauncherView);
|
| };
|
|
|
|
|