Rolling back change 22245.

chrome/browser/gtk/extension_shelf_gtk.h

 // Copyright (c) 2009 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 CHROME_BROWSER_GTK_EXTENSION_SHELF_GTK_H_
 #define CHROME_BROWSER_GTK_EXTENSION_SHELF_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <set>
@@ skipping 24 matching lines @@
   // default behaviour).
   void Show();
   void Hide();
 
   // ExtensionShelfModelObserver
   virtual void ToolstripInsertedAt(ExtensionHost* host, int index);
   virtual void ToolstripRemovingAt(ExtensionHost* host, int index);
   virtual void ToolstripMoved(ExtensionHost* host,
                               int from_index,
                               int to_index);
-  virtual void ToolstripChanged(ExtensionShelfModel::iterator toolstrip);
+  virtual void ToolstripChangedAt(ExtensionHost* host, int index);
   virtual void ExtensionShelfEmpty();
   virtual void ShelfModelReloaded();
-  virtual void ShelfModelDeleting();
 
  private:
   class Toolstrip;
 
   // Create the contents of the extension shelf.
   void Init(Profile* profile);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ skipping 23 matching lines @@
   GtkWidget* shelf_hbox_;
 
   GtkThemeProvider* theme_provider_;
 
   // Paints the background for our bookmark bar.
   scoped_ptr<NineBox> background_ninebox_;
 
   NotificationRegistrar registrar_;
 
   // The model representing the toolstrips on the shelf.
-  ExtensionShelfModel* model_;
+  scoped_ptr<ExtensionShelfModel> model_;
 
   // Set of toolstrip views which are really on the shelf.
   std::set<Toolstrip*> toolstrips_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionShelfGtk);
 };
 
 #endif  // CHROME_BROWSER_EXTENSION_SHELF_GTK_H_