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

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

Issue 1440303002: Componentize SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android/cros fixes Created 5 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/android/connection_info_popup_android.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/android/website_settings_popup_android.cc
diff --git a/chrome/browser/ui/android/website_settings_popup_android.cc b/chrome/browser/ui/android/website_settings_popup_android.cc
index e9cab3b4e706e27e06eba7a78c9d3c666b4ad18b..ad95f5e512910895029f0b1c3c14acd08ab2cfa0 100644
--- a/chrome/browser/ui/android/website_settings_popup_android.cc
+++ b/chrome/browser/ui/android/website_settings_popup_android.cc
@@ -9,6 +9,7 @@
#include "base/android/jni_string.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ssl/chrome_security_state_model_delegate.h"
#include "chrome/browser/ui/website_settings/website_settings.h"
#include "chrome/browser/ui/website_settings/website_settings_ui.h"
#include "components/content_settings/core/common/content_settings.h"
@@ -51,14 +52,14 @@ WebsiteSettingsPopupAndroid::WebsiteSettingsPopupAndroid(
popup_jobject_.Reset(env, java_website_settings_pop);
- SecurityStateModel* security_model =
- SecurityStateModel::FromWebContents(web_contents);
- DCHECK(security_model);
+ ChromeSecurityStateModelDelegate* security_model_delegate =
+ ChromeSecurityStateModelDelegate::FromWebContents(web_contents);
+ DCHECK(security_model_delegate);
presenter_.reset(new WebsiteSettings(
this, Profile::FromBrowserContext(web_contents->GetBrowserContext()),
TabSpecificContentSettings::FromWebContents(web_contents), web_contents,
- nav_entry->GetURL(), security_model->GetSecurityInfo(),
+ nav_entry->GetURL(), security_model_delegate->GetSecurityInfo(),
content::CertStore::GetInstance()));
}
« no previous file with comments | « chrome/browser/ui/android/connection_info_popup_android.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698