Revert 133089 - Implement LauncherIconObserver.

ash/launcher/launcher_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_LAUNCHER_LAUNCHER_VIEW_H_
 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_
 #pragma once
 
 #include <utility>
 #include <vector>
 
 #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"
 #include "ui/views/view.h"
 
 namespace views {
 class BoundsAnimator;
 class ImageButton;
 class MenuRunner;
 class ViewModel;
 }
 
 namespace ash {
 
 class LauncherDelegate;
 struct LauncherItem;
-class LauncherIconObserver;
 class LauncherModel;
 
 namespace internal {
 
 class LauncherButton;
 
 class ASH_EXPORT LauncherView : public views::View,
                                 public LauncherModelObserver,
                                 public views::ButtonListener,
                                 public LauncherButtonHost,
@@ skipping 19 matching lines @@
 
   LauncherView(LauncherModel* model, LauncherDelegate* delegate);
   virtual ~LauncherView();
 
   void Init();
 
   // Returns the ideal bounds of the specified item, or an empty rect if id
   // 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;
 
   // Overridden from FocusTraversable:
   virtual views::FocusSearch* GetFocusSearch() OVERRIDE;
   virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE;
   virtual View* GetFocusTraversableParentView() OVERRIDE;
 
  private:
   class FadeOutAnimationDelegate;
@@ skipping 83 matching lines @@
   // The model; owned by Launcher.
   LauncherModel* model_;
 
   // Delegate; owned by Launcher.
   LauncherDelegate* delegate_;
 
   // Used to manage the set of active launcher buttons. There is a view per
   // 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_;
 
   // Are we dragging? This is only set if the mouse is dragged far enough to
   // trigger a drag.
   bool dragging_;
 
   // The view being dragged. This is set immediately when the mouse is pressed.
   // |dragging_| is set only if the mouse is dragged far enough.
   views::View* drag_view_;
 
   // X coordinate of the mouse down event in |drag_view_|s coordinates.
   int drag_offset_;
 
   // Index |drag_view_| was initially at.
   int start_drag_index_;
 
   // Used for the context menu of a particular item.
   LauncherID context_menu_id_;
 
   scoped_ptr<views::FocusSearch> focus_search_;
 
 #if !defined(OS_MACOSX)
   scoped_ptr<views::MenuRunner> overflow_menu_runner_;
 
   scoped_ptr<views::MenuRunner> launcher_menu_runner_;
 #endif
 
-  ObserverList<LauncherIconObserver> observers_;
-
   DISALLOW_COPY_AND_ASSIGN(LauncherView);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_VIEW_H_