diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 18:56:21 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 18:56:21 +0000 |
| commit | 7e2041201c0de2336b80f5afb9e7bebeda6be68e (patch) | |
| tree | bfda35d9f7b84ec7347baa35b18551bfae967967 /chrome/browser/tab_contents/tab_contents_ssl_helper.cc | |
| parent | fed17d435c43ab7ef492664196ec4535b3a48af5 (diff) | |
| download | chromium_src-7e2041201c0de2336b80f5afb9e7bebeda6be68e.zip chromium_src-7e2041201c0de2336b80f5afb9e7bebeda6be68e.tar.gz chromium_src-7e2041201c0de2336b80f5afb9e7bebeda6be68e.tar.bz2 | |
Move infobar handling to a tab helper, part 1.
Revert revert of r99187.
This reverts r99198.
BUG=94741
TEST=no visible change
Review URL: http://codereview.chromium.org/7810002
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/7827017
Review URL: http://codereview.chromium.org/7826014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/tab_contents_ssl_helper.cc')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents_ssl_helper.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc index 3ae8a2e..a15bfa2 100644 --- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc +++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc @@ -12,6 +12,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/content_settings/host_content_settings_map.h" +#include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_add_cert_handler.h" #include "chrome/browser/ssl_client_certificate_selector.h" @@ -150,9 +151,10 @@ TabContentsSSLHelper::SSLAddCertData::~SSLAddCertData() { void TabContentsSSLHelper::SSLAddCertData::ShowInfoBar( InfoBarDelegate* delegate) { if (infobar_delegate_) - tab_contents_->ReplaceInfoBar(infobar_delegate_, delegate); + tab_contents_->infobar_tab_helper()->ReplaceInfoBar(infobar_delegate_, + delegate); else - tab_contents_->AddInfoBar(delegate); + tab_contents_->infobar_tab_helper()->AddInfoBar(delegate); infobar_delegate_ = delegate; } |