chrome/browser/ui/android/page_info/website_settings_popup_android.cc - Issue 2448943002: Refactor SecurityStateModel/Clients for simplicity and reusability.

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/page_info/website_settings_popup_android.cc

Issue 2448943002: Refactor SecurityStateModel/Clients for simplicity and reusability. (Closed)

Patch Set: sync. Created 4 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/page_info/connection_info_popup_android.cc ('k') | chrome/browser/ui/android/usb_chooser_dialog_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/page_info/website_settings_popup_android.cc

diff --git a/chrome/browser/ui/android/page_info/website_settings_popup_android.cc b/chrome/browser/ui/android/page_info/website_settings_popup_android.cc

index ea9d941d9da0f81a5437c57c65f719ec0f63fc4b..635464b3eaffeeaefd45b0523bd51c4b2994db83 100644

--- a/chrome/browser/ui/android/page_info/website_settings_popup_android.cc

+++ b/chrome/browser/ui/android/page_info/website_settings_popup_android.cc

@@ -10,11 +10,12 @@

#include "base/stl_util.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/ssl/security_state_tab_helper.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"

#include "components/content_settings/core/common/content_settings_types.h"

+#include "components/security_state/core/security_state.h"

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

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

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

@@ -51,11 +52,11 @@ WebsiteSettingsPopupAndroid::WebsiteSettingsPopupAndroid(

popup_jobject_.Reset(env, java_website_settings_pop);

- ChromeSecurityStateModelClient* security_model_client =

- ChromeSecurityStateModelClient::FromWebContents(web_contents);

- DCHECK(security_model_client);

- security_state::SecurityStateModel::SecurityInfo security_info;

- security_model_client->GetSecurityInfo(&security_info);

+ SecurityStateTabHelper* helper =

+ SecurityStateTabHelper::FromWebContents(web_contents);

+ DCHECK(helper);

+ security_state::SecurityInfo security_info;

+ helper->GetSecurityInfo(&security_info);

presenter_.reset(new WebsiteSettings(

this, Profile::FromBrowserContext(web_contents->GetBrowserContext()),