Rolling back change 22245.

chrome/browser/views/extensions/extension_shelf.h

Index: chrome/browser/views/extensions/extension_shelf.h
===================================================================
--- chrome/browser/views/extensions/extension_shelf.h	(revision 22246)
+++ chrome/browser/views/extensions/extension_shelf.h	(working copy)
@@ -27,7 +27,7 @@
   virtual ~ExtensionShelf();
 
   // Get the current model.
-  ExtensionShelfModel* model() { return model_; }
+  ExtensionShelfModel* model() { return model_.get(); }
 
   // View
   virtual void Paint(gfx::Canvas* canvas);
@@ -50,10 +50,9 @@
   virtual void ToolstripMoved(ExtensionHost* toolstrip,
                               int from_index,
                               int to_index);
-  virtual void ToolstripChanged(ExtensionShelfModel::iterator toolstrip);
+  virtual void ToolstripChangedAt(ExtensionHost* toolstrip, int index);
   virtual void ExtensionShelfEmpty();
   virtual void ShelfModelReloaded();
-  virtual void ShelfModelDeleting();
 
  protected:
   // View
@@ -67,13 +66,6 @@
   // Dragging toolstrips
   void DropExtension(Toolstrip* handle, const gfx::Point& pt, bool cancel);
 
-  // Expand the specified toolstrip, navigating to |url| if non-empty,
-  // and setting the |height|.
-  void ExpandToolstrip(ExtensionHost* host, const GURL& url, int height);
-
-  // Collapse the specified toolstrip, navigating to |url| if non-empty.
-  void CollapseToolstrip(ExtensionHost* host, const GURL& url);
-
   // Inits the background bitmap.
   void InitBackground(gfx::Canvas* canvas, const SkRect& subset);
 
@@ -94,7 +86,7 @@
   SkBitmap background_;
 
   // The model representing the toolstrips on the shelf.
-  ExtensionShelfModel* model_;
+  scoped_ptr<ExtensionShelfModel> model_;
 
   // Storage of strings needed for accessibility.
   std::wstring accessible_name_;