Change InfoBar-related notifications to be sourced from a TabContentsWrapper, not a TabContents. ...

chrome/browser/tab_contents/infobar_container.cc

 // Copyright (c) 2011 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.
 
 #if defined(TOOLKIT_VIEWS)  // TODO(pkasting): Port non-views to use this.
 
 #include "chrome/browser/tab_contents/infobar_container.h"
 
 #include "chrome/browser/tab_contents/infobar.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
@@ skipping 25 matching lines @@
     // animating, OnInfoBarStateChanged() won't get called; we'll manually
     // trigger this once for the whole set of changes below.  This also prevents
     // InfoBar::MaybeDelete() from calling RemoveInfoBar() a second time if the
     // infobar happens to be at zero height (dunno if this can actually happen).
     infobar->set_container(NULL);
     RemoveInfoBar(infobar);
   }
 
   tab_contents_ = contents;
   if (tab_contents_) {
-    Source<TabContents> tc_source(tab_contents_->tab_contents());
+    Source<TabContentsWrapper> tc_source(tab_contents_);
     registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_ADDED,
                    tc_source);
     registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
                    tc_source);
     registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REPLACED,
                    tc_source);
 
     for (size_t i = 0; i < tab_contents_->infobar_count(); ++i) {
       // As when we removed the infobars above, we prevent callbacks to
       // OnInfoBarAnimated() for each infobar.
@@ skipping 59 matching lines @@
   // and at worst disastrous to call that.
   delegate_ = NULL;
   ChangeTabContents(NULL);
 }
 
 void InfoBarContainer::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::TAB_CONTENTS_INFOBAR_ADDED:
-      AddInfoBar(
-          Details<InfoBarDelegate>(details)->CreateInfoBar(tab_contents_), true,
-          WANT_CALLBACK);
+      AddInfoBar(Details<InfoBar>(details).ptr(), true, WANT_CALLBACK);
       break;
 
-    case NotificationType::TAB_CONTENTS_INFOBAR_REMOVED:
-      RemoveInfoBar(Details<InfoBarDelegate>(details).ptr(), true);
-      break;
-
-    case NotificationType::TAB_CONTENTS_INFOBAR_REPLACED: {
-      typedef std::pair<InfoBarDelegate*, InfoBarDelegate*> InfoBarPair;
-      InfoBarPair* infobar_pair = Details<InfoBarPair>(details).ptr();
-      RemoveInfoBar(infobar_pair->first, false);
-      AddInfoBar(infobar_pair->second->CreateInfoBar(tab_contents_), false,
-                 WANT_CALLBACK);
+    case NotificationType::TAB_CONTENTS_INFOBAR_REMOVED: {
+      typedef std::pair<InfoBarDelegate*, bool> RemoveDetails;
+      RemoveDetails* remove_details = Details<RemoveDetails>(details).ptr();
+      RemoveInfoBar(remove_details->first, remove_details->second);
       break;
     }
 
+    case NotificationType::TAB_CONTENTS_INFOBAR_REPLACED: {
+      typedef std::pair<InfoBarDelegate*, InfoBar*> ReplaceDetails;
+      ReplaceDetails* replace_details = Details<ReplaceDetails>(details).ptr();
+      RemoveInfoBar(replace_details->first, false);
+      AddInfoBar(replace_details->second, false, WANT_CALLBACK);
+      break;
+    }
+
     default:
       NOTREACHED();
       break;
   }
 }
 
 void InfoBarContainer::RemoveInfoBar(InfoBarDelegate* delegate,
                                      bool use_animation) {
   // Search for the infobar associated with |delegate|.  We cannot search for
   // |delegate| in |tab_contents_|, because an InfoBar remains alive until its
@@ skipping 42 matching lines @@
     return InfoBar::kDefaultArrowTargetHeight;
   // When the first infobar is animating closed, we animate the second infobar's
   // arrow target height from the default to the top target height.  Note that
   // the animation values here are going from 1.0 -> 0.0 as the top bar closes.
   return top_arrow_target_height_ + static_cast<int>(
       (InfoBar::kDefaultArrowTargetHeight - top_arrow_target_height_) *
           first_infobar_animation->GetCurrentValue());
 }
 
 #endif  // TOOLKIT_VIEWS