Make PageInfoBubble not use BrowserList::GetLastActive and instead obtain a navigator at creation t…

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"
@@ skipping 87 matching lines @@
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PageInfoBubbleView
 
 PageInfoBubbleView::PageInfoBubbleView(views::View* anchor_view,
                                        Profile* profile,
                                        const GURL& url,
                                        const SSLStatus& ssl,
-                                       bool show_history)
+                                       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)),
       cert_id_(ssl.cert_id),
       help_center_link_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(resize_animation_(this)),
-      animation_start_height_(0) {
+      animation_start_height_(0),
+      navigator_(navigator) {
 
   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;
   }
@@ skipping 149 matching lines @@
 }
 
 gfx::Rect PageInfoBubbleView::GetAnchorRect() {
   // Compensate for some built-in padding in the icon.
   gfx::Rect anchor(BubbleDelegateView::GetAnchorRect());
   anchor.Inset(0, anchor_view() ? 5 : 0);
   return anchor;
 }
 
 void PageInfoBubbleView::LinkClicked(views::Link* source, int event_flags) {
-  Browser* browser = BrowserList::GetLastActive();
-  OpenURLParams params(
-      GURL(chrome::kPageInfoHelpCenterURL), Referrer(), NEW_FOREGROUND_TAB,
-      content::PAGE_TRANSITION_LINK, false);
-  browser->OpenURL(params);
+  navigator_->OpenURL(OpenURLParams(GURL(chrome::kPageInfoHelpCenterURL),
+                                    Referrer(),
+                                    NEW_FOREGROUND_TAB,
+                                    content::PAGE_TRANSITION_LINK,
+                                    false));
   // NOTE: The bubble closes automatically on deactivation as the link opens.
 }
 
 void PageInfoBubbleView::AnimationEnded(const ui::Animation* animation) {
   if (animation == &resize_animation_) {
     LayoutSections();
     SizeToContents();
   }
   BubbleDelegateView::AnimationEnded(animation);
 }
@@ skipping 145 matching lines @@
   y = std::max(y, (2 * kVerticalSectionPadding) + image_height);
   return gfx::Size(width, y);
 }
 
 namespace browser {
 
 void ShowPageInfoBubble(views::View* anchor_view,
                         Profile* profile,
                         const GURL& url,
                         const SSLStatus& ssl,
-                        bool show_history) {
+                        bool show_history,
+                        content::PageNavigator* navigator) {
   PageInfoBubbleView* page_info_bubble =
-      new PageInfoBubbleView(anchor_view, profile, url, ssl, show_history);
+      new PageInfoBubbleView(anchor_view,
+                             profile,
+                             url,
+                             ssl,
+                             show_history,
+                             navigator);
   views::BubbleDelegateView::CreateBubble(page_info_bubble);
   page_info_bubble->Show();
 }
 
 }