Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1752)

Unified Diff: ash/launcher/launcher_view.h

Issue 10142005: Revert 133089 - Implement LauncherIconObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/launcher_icon_observer.h ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « ash/launcher/launcher_icon_observer.h ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698