chrome/browser/ui/android/connection_info_popup_android.cc - Issue 1473523002: Switch SecurityStateModel ownership to ChromeSecurityStateModelClient

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1473523002: Switch SecurityStateModel ownership to ChromeSecurityStateModelClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: delegate -> client 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/bluetooth_chooser_android.cc ('k') | chrome/browser/ui/android/website_settings_popup_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 225b6204233bd299f676e8123c06f8f3692e49b3..16c3036393a1c5af8320ef74b3cdaa1828b4228b 100644

--- a/chrome/browser/ui/android/connection_info_popup_android.cc

+++ b/chrome/browser/ui/android/connection_info_popup_android.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/android/resource_mapper.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/ssl/chrome_security_state_model_client.h"

#include "chrome/browser/ui/website_settings/website_settings.h"

#include "chrome/grit/generated_resources.h"

#include "content/public/browser/browser_context.h"

@@ -90,14 +91,14 @@ ConnectionInfoPopupAndroid::ConnectionInfoPopupAndroid(

popup_jobject_.Reset(env, java_website_settings_pop);

- SecurityStateModel* security_model =

- SecurityStateModel::FromWebContents(web_contents);

- DCHECK(security_model);

+ ChromeSecurityStateModelClient* security_model_client =

+ ChromeSecurityStateModelClient::FromWebContents(web_contents);

+ DCHECK(security_model_client);

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_client->GetSecurityInfo(),

content::CertStore::GetInstance()));

}