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

chrome/browser/ui/cocoa/page_info_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/page_info_bubble_controller.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/cert_store.h"
+#include "content/public/browser/page_navigator.h"
 #include "content/public/common/ssl_status.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/x509_certificate.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/image/image.h"
 
@@ skipping 117 matching lines @@
 };
 
 }  // namespace
 
 namespace browser {
 
 void ShowPageInfoBubble(gfx::NativeWindow parent,
                         Profile* profile,
                         const GURL& url,
                         const SSLStatus& ssl,
-                        bool show_history) {
+                        bool show_history,
+                        content::PageNavigator* navigator) {
   PageInfoModelBubbleBridge* bridge = new PageInfoModelBubbleBridge();
   PageInfoModel* model =
       new PageInfoModel(profile, url, ssl, show_history, bridge);
   PageInfoBubbleController* controller =
       [[PageInfoBubbleController alloc] initWithPageInfoModel:model
                                                 modelObserver:bridge
-                                                 parentWindow:parent];
+                                                 parentWindow:parent
+                                                    navigator:navigator];
   bridge->set_controller(controller);
   [controller setCertID:ssl.cert_id];
   [controller showWindow:nil];
 }
 
 }  // namespace browser
 
 @implementation PageInfoBubbleController
 
 @synthesize certID = certID_;
 
 - (id)initWithPageInfoModel:(PageInfoModel*)model
               modelObserver:(PageInfoModelObserver*)bridge
-               parentWindow:(NSWindow*)parentWindow {
+               parentWindow:(NSWindow*)parentWindow
+                  navigator:(content::PageNavigator*)navigator{

[Finnur, 2012/05/23 16:33:25]

nit: space before {

   DCHECK(parentWindow);
 
   // Use an arbitrary height because it will be changed by the bridge.
   NSRect contentRect = NSMakeRect(0, 0, kWindowWidth, 1);
   // Create an empty window into which content is placed.
   scoped_nsobject<InfoBubbleWindow> window(
       [[InfoBubbleWindow alloc] initWithContentRect:contentRect
                                           styleMask:NSBorderlessWindowMask
                                             backing:NSBackingStoreBuffered
                                               defer:NO]);
 
   if ((self = [super initWithWindow:window.get()
                        parentWindow:parentWindow
                          anchoredAt:NSZeroPoint])) {
     model_.reset(model);
     bridge_.reset(bridge);
+    navigator_ = navigator;
     [[self bubble] setArrowLocation:info_bubble::kTopLeft];
     [self performLayout];
   }
   return self;
 }
 
 - (PageInfoModel*)model {
   return model_.get();
 }
 
 - (IBAction)showCertWindow:(id)sender {
   DCHECK(certID_ != 0);
   ShowCertificateViewerByID([self parentWindow], certID_);
 }
 
 - (IBAction)showHelpPage:(id)sender {
-  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));
 }
 
 // This will create the subviews for the page info window. The general layout
 // is 2 or 3 boxed and titled sections, each of which has a status image to
 // provide visual feedback and a description that explains it. The description
 // text is usually only 1 or 2 lines, but can be much longer. At the bottom of
 // the window is a button to view the SSL certificate, which is disabled if
 // not using HTTPS.
 - (void)performLayout {
   // |offset| is the Y position that should be drawn at next.
@@ skipping 245 matching lines @@
     LocationBarViewMac* locationBar = [controller locationBarBridge];
     if (locationBar) {
       NSPoint bubblePoint = locationBar->GetPageInfoBubblePoint();
       origin = [parent convertBaseToScreen:bubblePoint];
     }
   }
   return origin;
 }
 
 @end