| Index: chrome/browser/ui/views/page_info_bubble_view.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/page_info_bubble_view.cc (revision 142088)
|
| +++ chrome/browser/ui/views/page_info_bubble_view.cc (working copy)
|
| @@ -9,6 +9,7 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/certificate_viewer.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| +#include "chrome/browser/ui/tab_contents/tab_contents.h"
|
| #include "chrome/browser/ui/views/frame/browser_view.h"
|
| #include "chrome/browser/ui/views/toolbar_view.h"
|
| #include "chrome/common/url_constants.h"
|
| @@ -102,20 +103,20 @@
|
| // PageInfoBubbleView
|
|
|
| PageInfoBubbleView::PageInfoBubbleView(views::View* anchor_view,
|
| - Profile* profile,
|
| + TabContents* tab_contents,
|
| const GURL& url,
|
| const SSLStatus& ssl,
|
| bool show_history,
|
| content::PageNavigator* navigator)
|
| : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_LEFT),
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(model_(profile, url, ssl,
|
| + ALLOW_THIS_IN_INITIALIZER_LIST(model_(tab_contents->profile(), url, ssl,
|
| show_history, this)),
|
| cert_id_(ssl.cert_id),
|
| help_center_link_(NULL),
|
| ALLOW_THIS_IN_INITIALIZER_LIST(resize_animation_(this)),
|
| animation_start_height_(0),
|
| - navigator_(navigator) {
|
| -
|
| + navigator_(navigator),
|
| + tab_contents_(tab_contents) {
|
| if (cert_id_ > 0) {
|
| scoped_refptr<net::X509Certificate> cert;
|
| content::CertStore::GetInstance()->RetrieveCert(cert_id_, &cert);
|
| @@ -135,7 +136,7 @@
|
| void PageInfoBubbleView::ShowCertDialog() {
|
| gfx::NativeWindow parent =
|
| anchor_view() ? anchor_view()->GetWidget()->GetNativeWindow() : NULL;
|
| - ShowCertificateViewerByID(parent, cert_id_);
|
| + ShowCertificateViewerByID(tab_contents_, parent, cert_id_);
|
| }
|
|
|
| gfx::Size PageInfoBubbleView::GetSeparatorSize() {
|
| @@ -453,14 +454,14 @@
|
| namespace browser {
|
|
|
| void ShowPageInfoBubble(views::View* anchor_view,
|
| - Profile* profile,
|
| + TabContents* tab_contents,
|
| const GURL& url,
|
| const SSLStatus& ssl,
|
| bool show_history,
|
| content::PageNavigator* navigator) {
|
| PageInfoBubbleView* page_info_bubble =
|
| new PageInfoBubbleView(anchor_view,
|
| - profile,
|
| + tab_contents,
|
| url,
|
| ssl,
|
| show_history,
|
|
|