Fix bug where an extension toolstrip would sometimes get added twice to the

bookmark bar.  The problem was that sometimes the EXTENSIONS_LOADED
notification would get sent before we initialized the bookmark view (which
adds the initial extension toolstrips).
Review URL: http://codereview.chromium.org/42252

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11927 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 3 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 3fe0dbf..95f80fa 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -509,10 +509,21 @@ void BookmarkBarView::SetProfile(Profile* profile) {
   ns->AddObserver(this, NotificationType::EXTENSIONS_LOADED,
                   NotificationService::AllSources());
 
+  // Add any already-loaded extensions now, since we missed the notification for
+  // those.
+  if (profile_->GetExtensionsService()) {  // null in unit tests
+    if (AddExtensionToolstrips(
+          profile_->GetExtensionsService()->extensions())) {
+      Layout();
+      SchedulePaint();
+    }
+  }
+
   model_ = profile_->GetBookmarkModel();
   model_->AddObserver(this);
   if (model_->IsLoaded())
     Loaded(model_);
+
   // else case: we'll receive notification back from the BookmarkModel when done
   // loading, then we'll populate the bar.
 }
@@ -1010,9 +1021,6 @@ void BookmarkBarView::Loaded(BookmarkModel* model) {
     AddChildView(i, CreateBookmarkButton(node->GetChild(i)));
   other_bookmarked_button_->SetEnabled(true);
 
-  if (profile_->GetExtensionsService())  // null in unit tests
-    AddExtensionToolstrips(profile_->GetExtensionsService()->extensions());
-
   Layout();
   SchedulePaint();
 }