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

Unified Diff: chrome/browser/ui/android/connection_info_popup_android.cc

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/android/connection_info_popup_android.cc
diff --git a/chrome/browser/ui/android/connection_info_popup_android.cc b/chrome/browser/ui/android/connection_info_popup_android.cc
index d049fdf4a992c4669297218d0e4a20e4e1ee1a97..225b6204233bd299f676e8123c06f8f3692e49b3 100644
--- a/chrome/browser/ui/android/connection_info_popup_android.cc
+++ b/chrome/browser/ui/android/connection_info_popup_android.cc
@@ -90,13 +90,14 @@ ConnectionInfoPopupAndroid::ConnectionInfoPopupAndroid(
popup_jobject_.Reset(env, java_website_settings_pop);
+ SecurityStateModel* security_model =
+ SecurityStateModel::FromWebContents(web_contents);
+ DCHECK(security_model);
+
presenter_.reset(new WebsiteSettings(
- this,
- Profile::FromBrowserContext(web_contents->GetBrowserContext()),
- TabSpecificContentSettings::FromWebContents(web_contents),
- web_contents,
- nav_entry->GetURL(),
- nav_entry->GetSSL(),
+ this, Profile::FromBrowserContext(web_contents->GetBrowserContext()),
+ TabSpecificContentSettings::FromWebContents(web_contents), web_contents,
+ nav_entry->GetURL(), security_model->GetSecurityInfo(),
content::CertStore::GetInstance()));
}

Powered by Google App Engine
This is Rietveld 408576698