| Index: chrome/browser/ui/cocoa/page_info_bubble_controller.mm
|
| ===================================================================
|
| --- chrome/browser/ui/cocoa/page_info_bubble_controller.mm (revision 142088)
|
| +++ chrome/browser/ui/cocoa/page_info_bubble_controller.mm (working copy)
|
| @@ -22,6 +22,7 @@
|
| #include "chrome/common/url_constants.h"
|
| #include "content/public/browser/cert_store.h"
|
| #include "content/public/browser/page_navigator.h"
|
| +#include "content/public/browser/web_contents.h"
|
| #include "content/public/common/ssl_status.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/locale_settings.h"
|
| @@ -35,6 +36,7 @@
|
| using content::OpenURLParams;
|
| using content::Referrer;
|
| using content::SSLStatus;
|
| +using content::WebContents;
|
|
|
| @interface PageInfoBubbleController (Private)
|
| - (PageInfoModel*)model;
|
| @@ -156,18 +158,20 @@
|
| namespace browser {
|
|
|
| void ShowPageInfoBubble(gfx::NativeWindow parent,
|
| - Profile* profile,
|
| + WebContents* web_contents,
|
| const GURL& url,
|
| const SSLStatus& ssl,
|
| bool show_history,
|
| content::PageNavigator* navigator) {
|
| PageInfoModelBubbleBridge* bridge = new PageInfoModelBubbleBridge();
|
| - PageInfoModel* model =
|
| - new PageInfoModel(profile, url, ssl, show_history, bridge);
|
| + PageInfoModel* model = new PageInfoModel(
|
| + Profile::FromBrowserContext(web_contents->GetBrowserContext()), url, ssl,
|
| + show_history, bridge);
|
| PageInfoBubbleController* controller =
|
| [[PageInfoBubbleController alloc] initWithPageInfoModel:model
|
| modelObserver:bridge
|
| parentWindow:parent
|
| + webContents:web_contents
|
| navigator:navigator];
|
| bridge->set_controller(controller);
|
| [controller setCertID:ssl.cert_id];
|
| @@ -183,6 +187,7 @@
|
| - (id)initWithPageInfoModel:(PageInfoModel*)model
|
| modelObserver:(PageInfoModelObserver*)bridge
|
| parentWindow:(NSWindow*)parentWindow
|
| + webContents:(WebContents*)webContents
|
| navigator:(content::PageNavigator*)navigator {
|
| DCHECK(parentWindow);
|
|
|
| @@ -200,6 +205,7 @@
|
| anchoredAt:NSZeroPoint])) {
|
| model_.reset(model);
|
| bridge_.reset(bridge);
|
| + webContents_ = webContents;
|
| navigator_ = navigator;
|
| [[self bubble] setArrowLocation:info_bubble::kTopLeft];
|
| [self performLayout];
|
| @@ -213,7 +219,7 @@
|
|
|
| - (IBAction)showCertWindow:(id)sender {
|
| DCHECK(certID_ != 0);
|
| - ShowCertificateViewerByID([self parentWindow], certID_);
|
| + ShowCertificateViewerByID(webContents_, [self parentWindow], certID_);
|
| }
|
|
|
| - (IBAction)showHelpPage:(id)sender {
|
|
|