chrome/browser/ui/views/frame/web_app_left_header_view_ash.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/views/frame/web_app_left_header_view_ash.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/toolbar/toolbar_model_impl.cc ('k') | chrome/browser/ui/views/location_bar/page_info_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc

diff --git a/chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc b/chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc

index 2c2dc2a19788128198a1f3a1bb09c8088ee3b872..299b76c9eca83f8e2b67ef89e65b5cf78eaf09d7 100644

--- a/chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc

+++ b/chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc

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

#include "ash/frame/caption_buttons/frame_caption_button.h"

#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"

#include "chrome/app/chrome_command_ids.h"

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

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

#include "chrome/browser/ui/views/frame/browser_view.h"

#include "components/toolbar/toolbar_model.h"

@@ -90,10 +91,11 @@ void WebAppLeftHeaderView::ShowWebsiteSettings() const {

if (!nav_entry)

return;

- SecurityStateModel* security_model = SecurityStateModel::FromWebContents(tab);

- DCHECK(security_model);

+ ChromeSecurityStateModelClient* security_model_delegate =

+ ChromeSecurityStateModelClient::FromWebContents(tab);

+ DCHECK(security_model_delegate);

chrome::ShowWebsiteSettings(browser_view_->browser(), tab,

nav_entry->GetURL(),

- security_model->GetSecurityInfo());

+ security_model_delegate->GetSecurityInfo());

}