Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: chrome/browser/ui/cocoa/page_info_bubble_controller.mm

Issue 10554010: Remove BrowserList::GetLastActive usage from WebUI pages. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: review comments Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 {
« no previous file with comments | « chrome/browser/ui/cocoa/page_info_bubble_controller.h ('k') | chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698