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

chrome/browser/ui/tab_contents/tab_contents_wrapper.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.
 
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_manager.h"
@@ skipping 433 matching lines @@
     if (infobar_delegates_[i]->EqualsDelegate(delegate)) {
       // Tell the new infobar to close so that it can clean itself up.
       delegate->InfoBarClosed();
       return;
     }
   }
 
   infobar_delegates_.push_back(delegate);
   NotificationService::current()->Notify(
       NotificationType::TAB_CONTENTS_INFOBAR_ADDED,
-      Source<TabContents>(tab_contents_.get()),
-      Details<InfoBarDelegate>(delegate));
+      Source<TabContentsWrapper>(this),
+      Details<InfoBar>(delegate->CreateInfoBar(this)));
 
   // Add ourselves as an observer for navigations the first time a delegate is
   // added. We use this notification to expire InfoBars that need to expire on
   // page transitions.
   if (infobar_delegates_.size() == 1) {
     registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                    Source<NavigationController>(&tab_contents_->controller()));
   }
 }
 
 void TabContentsWrapper::RemoveInfoBar(InfoBarDelegate* delegate) {
   if (!infobars_enabled_)
     return;
 
   std::vector<InfoBarDelegate*>::iterator it =
       find(infobar_delegates_.begin(), infobar_delegates_.end(), delegate);
   if (it != infobar_delegates_.end()) {
-    InfoBarDelegate* delegate = *it;
+    typedef std::pair<InfoBarDelegate*, bool> RemoveDetails;
+    RemoveDetails remove_details(*it, true);
     NotificationService::current()->Notify(
         NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
-        Source<TabContents>(tab_contents_.get()),
-        Details<InfoBarDelegate>(delegate));
+        Source<TabContentsWrapper>(this),
+        Details<RemoveDetails>(&remove_details));
 
     infobar_delegates_.erase(it);
     // Remove ourselves as an observer if we are tracking no more InfoBars.
     if (infobar_delegates_.empty()) {
       registrar_.Remove(
           this, NotificationType::NAV_ENTRY_COMMITTED,
           Source<NavigationController>(&tab_contents_->controller()));
     }
   }
 }
 
 void TabContentsWrapper::ReplaceInfoBar(InfoBarDelegate* old_delegate,
                                         InfoBarDelegate* new_delegate) {
   if (!infobars_enabled_) {
     new_delegate->InfoBarClosed();
     return;
   }
 
   std::vector<InfoBarDelegate*>::iterator it =
       find(infobar_delegates_.begin(), infobar_delegates_.end(), old_delegate);
   DCHECK(it != infobar_delegates_.end());
 
   // Notify the container about the change of plans.
-  scoped_ptr<std::pair<InfoBarDelegate*, InfoBarDelegate*> > details(
-    new std::pair<InfoBarDelegate*, InfoBarDelegate*>(
-        old_delegate, new_delegate));
+  typedef std::pair<InfoBarDelegate*, InfoBar*> ReplaceDetails;
+  ReplaceDetails replace_details(old_delegate,
+                                 new_delegate->CreateInfoBar(this));
   NotificationService::current()->Notify(
       NotificationType::TAB_CONTENTS_INFOBAR_REPLACED,
-      Source<TabContents>(tab_contents_.get()),
-      Details<std::pair<InfoBarDelegate*, InfoBarDelegate*> >(details.get()));
+      Source<TabContentsWrapper>(this),
+      Details<ReplaceDetails>(&replace_details));
 
   // Remove the old one.
   infobar_delegates_.erase(it);
 
   // Add the new one.
   DCHECK(find(infobar_delegates_.begin(),
               infobar_delegates_.end(), new_delegate) ==
          infobar_delegates_.end());
   infobar_delegates_.push_back(new_delegate);
 }
@@ skipping 63 matching lines @@
 void TabContentsWrapper::UpdateWebPreferences() {
   RenderViewHostDelegate* rvhd = tab_contents();
   Send(new ViewMsg_UpdateWebPreferences(routing_id(), rvhd->GetWebkitPrefs()));
 }
 
 void TabContentsWrapper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
       tab_contents()->GetMutableRendererPrefs(), profile());
   render_view_host()->SyncRendererPrefs();
 }