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

chrome/browser/tab_contents/tab_contents_ssl_helper.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/tab_contents/tab_contents_ssl_helper.h"
 
 #include "base/basictypes.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
@@ skipping 110 matching lines @@
   InfoBarDelegate* infobar_delegate_;
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLAddCertData);
 };
 
 TabContentsSSLHelper::SSLAddCertData::SSLAddCertData(
     TabContentsWrapper* tab_contents)
     : tab_contents_(tab_contents),
       infobar_delegate_(NULL) {
-  Source<TabContents> source(tab_contents_->tab_contents());
+  Source<TabContentsWrapper> source(tab_contents_);
   registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REMOVED, source);
   registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REPLACED, source);
 }
 
 TabContentsSSLHelper::SSLAddCertData::~SSLAddCertData() {
 }
 
 void TabContentsSSLHelper::SSLAddCertData::ShowInfoBar(
     InfoBarDelegate* delegate) {
   if (infobar_delegate_)
     tab_contents_->ReplaceInfoBar(infobar_delegate_, delegate);
   else
     tab_contents_->AddInfoBar(delegate);
   infobar_delegate_ = delegate;
 }
 
 void TabContentsSSLHelper::SSLAddCertData::ShowErrorInfoBar(
     const string16& message) {
   ShowInfoBar(new SimpleAlertInfoBarDelegate(
       tab_contents_->tab_contents(), GetCertIcon(), message, true));
 }
 
 void TabContentsSSLHelper::SSLAddCertData::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  typedef std::pair<InfoBarDelegate*, InfoBarDelegate*> InfoBarDelegatePair;
+  DCHECK(type.value == NotificationType::TAB_CONTENTS_INFOBAR_REMOVED ||
+         type.value == NotificationType::TAB_CONTENTS_INFOBAR_REPLACED);
   if (infobar_delegate_ ==
       ((type.value == NotificationType::TAB_CONTENTS_INFOBAR_REMOVED) ?
-          Details<InfoBarDelegate>(details).ptr() :
-          Details<InfoBarDelegatePair>(details).ptr()->first))
+          Details<std::pair<InfoBarDelegate*, bool> >(details)->first :
+          Details<std::pair<InfoBarDelegate*, InfoBar*> >(details)->first))
     infobar_delegate_ = NULL;
 }
 
 
 // TabContentsSSLHelper -------------------------------------------------------
 
 TabContentsSSLHelper::TabContentsSSLHelper(TabContentsWrapper* tab_contents)
     : tab_contents_(tab_contents) {
 }
 
@@ skipping 50 matching lines @@
 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData(
     SSLAddCertHandler* handler) {
   // Find/create the slot.
   linked_ptr<SSLAddCertData>& ptr_ref =
       request_id_to_add_cert_data_[handler->network_request_id()];
   // Fill it if necessary.
   if (!ptr_ref.get())
     ptr_ref.reset(new SSLAddCertData(tab_contents_));
   return ptr_ref.get();
 }