Remove BrowserList::GetLastActive usage from WebUI pages.

chrome/browser/ui/views/page_info_bubble_view.cc

 // Copyright (c) 2012 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/views/page_info_bubble_view.h"
 
 #include <algorithm>
 
 #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"
 #include "content/public/browser/cert_store.h"
 #include "content/public/common/ssl_status.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::SSLStatus;
+using content::WebContents;
 
 namespace {
 
 // Layout constants.
 const int kHGapToBorder = 11;
 const int kVerticalSectionPadding = 8;
 const int kVGapToHeadline = 5;
 const int kHGapImageToDescription = 6;
 const int kTextPaddingRight = 10;
 const int kPaddingBelowSeparator = 6;
@@ skipping 52 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(Section);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PageInfoBubbleView
 
 PageInfoBubbleView::PageInfoBubbleView(views::View* anchor_view,
-                                       Profile* profile,
+                                       WebContents* web_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,
-                                            show_history, this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(model_(
+          TabContents::FromWebContents(web_contents)->profile(), url, ssl,

[Ben Goodger (Google), 2012/06/19 14:55:07]

Profile::FromBrowserContext(web_contents->GetBrowserContext()) avoids the TC
include

[jam, 2012/06/19 15:13:28]

Done.

+          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),
+      web_contents_(web_contents) {
   if (cert_id_ > 0) {
     scoped_refptr<net::X509Certificate> cert;
     content::CertStore::GetInstance()->RetrieveCert(cert_id_, &cert);
     // When running with fake certificate (Chrome Frame), we have no os
     // certificate, so there is no cert to show. Don't bother showing the cert
     // info link in that case.
     if (!cert.get() || !cert->os_cert_handle())
       cert_id_ = 0;
   }
   LayoutSections();
 }
 
 PageInfoBubbleView::~PageInfoBubbleView() {
   resize_animation_.Reset();
 }
 
 void PageInfoBubbleView::ShowCertDialog() {
   gfx::NativeWindow parent =
       anchor_view() ? anchor_view()->GetWidget()->GetNativeWindow() : NULL;
-  ShowCertificateViewerByID(parent, cert_id_);
+  ShowCertificateViewerByID(web_contents_, parent, cert_id_);
 }
 
 gfx::Size PageInfoBubbleView::GetSeparatorSize() {
   // Calculate how much space the separators take up (with padding).
   views::Separator separator;
   gfx::Size separator_size = separator.GetPreferredSize();
   gfx::Size separator_plus_padding(0, separator_size.height() +
                                       kPaddingAboveSeparator +
                                       kPaddingBelowSeparator);
   return separator_plus_padding;
@@ skipping 297 matching lines @@
   }
 
   // Make sure the image is not truncated if the text doesn't contain much.
   y = std::max(y, (2 * kVerticalSectionPadding) + image_height);
   return gfx::Size(width, y);
 }
 
 namespace browser {
 
 void ShowPageInfoBubble(views::View* anchor_view,
-                        Profile* profile,
+                        WebContents* web_contents,
                         const GURL& url,
                         const SSLStatus& ssl,
                         bool show_history,
                         content::PageNavigator* navigator) {
   PageInfoBubbleView* page_info_bubble =
       new PageInfoBubbleView(anchor_view,
-                             profile,
+                             web_contents,
                              url,
                              ssl,
                              show_history,
                              navigator);
   views::BubbleDelegateView::CreateBubble(page_info_bubble);
   page_info_bubble->Show();
 }
 
 }