Rolling back change 22245.

chrome/browser/gtk/extension_shelf_gtk.cc

 // 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.
 
 #include "chrome/browser/gtk/extension_shelf_gtk.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/nine_box.h"
@@ skipping 49 matching lines @@
 }
 
 void ExtensionShelfGtk::Toolstrip::Init() {
   label_.Own(gtk_label_new(extension_name_.c_str()));
   gtk_widget_show_all(label_.get());
 }
 
 ExtensionShelfGtk::ExtensionShelfGtk(Profile* profile, Browser* browser)
     : browser_(browser),
       theme_provider_(GtkThemeProvider::GetFrom(profile)),
-      model_(browser->extension_shelf_model()) {
+      model_(new ExtensionShelfModel(browser)) {
   Init(profile);
 
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
 }
 
 ExtensionShelfGtk::~ExtensionShelfGtk() {
-  if (model_)
-    model_->RemoveObserver(this);
+  model_->RemoveObserver(this);
   event_box_.Destroy();
 }
 
 void ExtensionShelfGtk::AddShelfToBox(GtkWidget* box) {
   gtk_box_pack_end(GTK_BOX(box), event_box_.get(), FALSE, FALSE, 0);
 }
 
 void ExtensionShelfGtk::Show() {
   gtk_widget_show_all(event_box_.get());
 }
@@ skipping 23 matching lines @@
   AdjustHeight();
 }
 
 void ExtensionShelfGtk::ToolstripMoved(ExtensionHost* host,
                                        int from_index,
                                        int to_index) {
   // TODO(phajdan.jr): Implement reordering toolstrips.
   AdjustHeight();
 }
 
-void ExtensionShelfGtk::ToolstripChanged(
-    ExtensionShelfModel::iterator toolstrip) {
+void ExtensionShelfGtk::ToolstripChangedAt(ExtensionHost* host,
+                                           int index) {
   // TODO(phajdan.jr): Implement changing toolstrips.
   AdjustHeight();
 }
 
 void ExtensionShelfGtk::ExtensionShelfEmpty() {
   AdjustHeight();
 }
 
 void ExtensionShelfGtk::ShelfModelReloaded() {
   for (std::set<Toolstrip*>::iterator iter = toolstrips_.begin();
        iter != toolstrips_.end(); ++iter) {
     (*iter)->RemoveToolstripFromBox(shelf_hbox_);
     delete *iter;
   }
   toolstrips_.clear();
   LoadFromModel();
 }
 
-void ExtensionShelfGtk::ShelfModelDeleting() {
-  for (std::set<Toolstrip*>::iterator iter = toolstrips_.begin();
-       iter != toolstrips_.end(); ++iter) {
-    (*iter)->RemoveToolstripFromBox(shelf_hbox_);
-    delete *iter;
-  }
-  toolstrips_.clear();
-
-  model_->RemoveObserver(this);
-  model_ = NULL;
-}
-
 void ExtensionShelfGtk::Init(Profile* profile) {
   event_box_.Own(gtk_event_box_new());
 
   shelf_hbox_ = gtk_hbox_new(FALSE, 0);
   gtk_widget_set_app_paintable(shelf_hbox_, TRUE);
   g_signal_connect(G_OBJECT(shelf_hbox_), "expose-event",
                    G_CALLBACK(&OnHBoxExpose), this);
   gtk_container_add(GTK_CONTAINER(event_box_.get()), shelf_hbox_);
 
   LoadFromModel();
@@ skipping 28 matching lines @@
   } else {
     gtk_widget_set_size_request(event_box_.get(), -1, kShelfHeight);
     Show();
   }
 }
 
 void ExtensionShelfGtk::LoadFromModel() {
   DCHECK(toolstrips_.empty());
   int count = model_->count();
   for (int i = 0; i < count; ++i)
-    ToolstripInsertedAt(model_->ToolstripAt(i).host, i);
+    ToolstripInsertedAt(model_->ToolstripAt(i), i);
   AdjustHeight();
 }
 
 ExtensionShelfGtk::Toolstrip* ExtensionShelfGtk::ToolstripAtIndex(int index) {
-  return static_cast<Toolstrip*>(model_->ToolstripAt(index).data);
+  return static_cast<Toolstrip*>(model_->ToolstripDataAt(index));
 }
 
 // static
 gboolean ExtensionShelfGtk::OnHBoxExpose(GtkWidget* widget,
                                          GdkEventExpose* event,
                                          ExtensionShelfGtk* bar) {
   // Paint the background theme image.
   cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
   cairo_rectangle(cr, event->area.x, event->area.y,
                   event->area.width, event->area.height);
   cairo_clip(cr);
   bar->InitBackground();
   bar->background_ninebox_->RenderTopCenterStrip(
       cr, event->area.x, event->area.y,
       event->area.x + event->area.width);
   cairo_destroy(cr);
 
   return FALSE;  // Propagate expose to children.
 }