chrome/browser/ui/browser.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/browser.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/website_settings_popup_android.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.cc

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

index 14de5c7c953315aa988b50d49b6cfb55a777cbcc..ec83317347e63b5bb3ab50bc6fa53e124c420e09 100644

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

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

@@ -76,6 +76,7 @@

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

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

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

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

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

#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/browser/sync/sync_ui_util.h"

@@ -1313,10 +1314,11 @@ bool Browser::CanDragEnter(content::WebContents* source,

content::SecurityStyle Browser::GetSecurityStyle(

WebContents* web_contents,

content::SecurityStyleExplanations* security_style_explanations) {

- SecurityStateModel* model = SecurityStateModel::FromWebContents(web_contents);

- DCHECK(model);

+ ChromeSecurityStateModelClient* model_client =

+ ChromeSecurityStateModelClient::FromWebContents(web_contents);

+ DCHECK(model_client);

const SecurityStateModel::SecurityInfo& security_info =

- model->GetSecurityInfo();

+ model_client->GetSecurityInfo();

const content::SecurityStyle security_style =

SecurityLevelToSecurityStyle(security_info.security_level);