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

Unified Diff: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

Issue 1314953009: Refactor WebsiteSettings to operate on a SecurityInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 3 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/website_settings/website_settings_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
index 7d28065a32bf2b5fdc9d32a9c75af610506d3bba..de25d11620d464383d8aefbe3277bb0865053c71 100644
--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
@@ -1271,15 +1271,16 @@ void WebsiteSettingsUIBridge::set_bubble_controller(
bubble_controller_ = controller;
}
-void WebsiteSettingsUIBridge::Show(gfx::NativeWindow parent,
- Profile* profile,
- content::WebContents* web_contents,
- const GURL& url,
- const content::SSLStatus& ssl) {
+void WebsiteSettingsUIBridge::Show(
+ gfx::NativeWindow parent,
+ Profile* profile,
+ content::WebContents* web_contents,
+ const GURL& url,
+ const SecurityStateModel::SecurityInfo& security_info) {
if (chrome::ToolkitViewsDialogsEnabled()) {
chrome::ShowWebsiteSettingsBubbleViewsAtPoint(
gfx::ScreenPointFromNSPoint(AnchorPointForWindow(parent)), profile,
- web_contents, url, ssl);
+ web_contents, url, security_info);
return;
}
@@ -1302,7 +1303,7 @@ void WebsiteSettingsUIBridge::Show(gfx::NativeWindow parent,
WebsiteSettings* presenter = new WebsiteSettings(
bridge, profile,
TabSpecificContentSettings::FromWebContents(web_contents), web_contents,
- url, ssl, content::CertStore::GetInstance());
+ url, security_info, content::CertStore::GetInstance());
[bubble_controller setPresenter:presenter];
}

Powered by Google App Engine
This is Rietveld 408576698