chrome/browser/ui/tab_helpers.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/tab_helpers.cc

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

Patch Set: rebase 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

« chrome/browser/ssl/security_state_model_android.cc ('K') | « chrome/browser/ui/extensions/hosted_app_browser_controller.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tab_helpers.cc

diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc

index 04339568b5b6271ca4a234a1d180fae48fb5e6dd..b9947de903b3be6b4a07256af09f6d1c758aa0c9 100644

--- a/chrome/browser/ui/tab_helpers.cc

+++ b/chrome/browser/ui/tab_helpers.cc

@@ -24,7 +24,7 @@

#include "chrome/browser/prerender/prerender_tab_helper.h"

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

#include "chrome/browser/sessions/session_tab_helper.h"

-#include "chrome/browser/ssl/security_state_model.h"

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

#include "chrome/browser/tab_contents/navigation_metrics_recorder.h"

#include "chrome/browser/tracing/navigation_tracing.h"

#include "chrome/browser/translate/chrome_translate_client.h"

@@ -170,7 +170,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {

PrefsTabHelper::CreateForWebContents(web_contents);

prerender::PrerenderTabHelper::CreateForWebContents(web_contents);

SearchTabHelper::CreateForWebContents(web_contents);

- SecurityStateModel::CreateForWebContents(web_contents);

+ ChromeSecurityStateModelClient::CreateForWebContents(web_contents);

if (SiteEngagementService::IsEnabled())

SiteEngagementHelper::CreateForWebContents(web_contents);

// TODO(vabr): Remove TabSpecificContentSettings from here once their function