Attempt at fixing crash from ExtensionToolbarModel. See bug for

chrome/browser/extensions/extension_toolbar_model.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 
 #include "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 182 matching lines @@
 void ExtensionToolbarModel::AddExtension(const Extension* extension,
                                          ExtensionList* list) {
   // We only care about extensions with browser actions.
   if (!extension->browser_action())
     return;
 
   if (extension->id() == last_extension_removed_ &&
       last_extension_removed_index_ < list->size()) {
     list->insert(list->begin() + last_extension_removed_index_,
                  make_scoped_refptr(extension));
-    FOR_EACH_OBSERVER(Observer, observers_,
-        BrowserActionAdded(extension, last_extension_removed_index_));
+    // TODO: figure out the right long term solution.
+    if (list == &toolbar_items_) {
+      FOR_EACH_OBSERVER(Observer, observers_,
+          BrowserActionAdded(extension, last_extension_removed_index_));
+    }
   } else {
     list->push_back(make_scoped_refptr(extension));
-    FOR_EACH_OBSERVER(Observer, observers_,
-                      BrowserActionAdded(extension, list->size() - 1));
+    // TODO: figure out the right long term solution.
+    if (list == &toolbar_items_) {
+      FOR_EACH_OBSERVER(Observer, observers_,
+                        BrowserActionAdded(extension, list->size() - 1));
+    }
   }
 
   last_extension_removed_ = "";
   last_extension_removed_index_ = -1;
 
   UpdatePrefs();
 }
 
 void ExtensionToolbarModel::RemoveExtension(const Extension* extension,
                                             ExtensionList* list) {
   ExtensionList::iterator pos =
       std::find(list->begin(), list->end(), extension);
   if (pos == list->end())
     return;
 
   last_extension_removed_ = extension->id();
   last_extension_removed_index_ = pos - list->begin();
 
   list->erase(pos);
-  FOR_EACH_OBSERVER(Observer, observers_,
-                    BrowserActionRemoved(extension));
+  // TODO: figure out the right long term solution.
+  if (list == &toolbar_items_) {
+    FOR_EACH_OBSERVER(Observer, observers_,
+                      BrowserActionRemoved(extension));
+  }
 
   UpdatePrefs();
 }
 
 extensions::ExtensionList* ExtensionToolbarModel::FindListWithExtension(
     const Extension* extension) {
   if (IsInExtensionList(extension, toolbar_items_))
     return &toolbar_items_;
   return IsInExtensionList(extension, action_box_menu_items_) ?
       &action_box_menu_items_ : NULL;
@@ skipping 149 matching lines @@
   for (ExtensionList::iterator iter = toolbar_items_.begin();
        iter != toolbar_items_.end();
        ++iter, ++i) {
     if (original_index == i)
       break;
     if (service_->IsIncognitoEnabled((*iter)->id()))
       ++incognito_index;
   }
   return incognito_index;
 }