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

Index: chrome/browser/ui/extensions/hosted_app_browser_controller.cc

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

index 55febb5ea8afb89ee5f54dce9b21881185c40719..f386e58fe69df095a548e12a93ab2844b25cff78 100644

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

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

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

#include "base/command_line.h"

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

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

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

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

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

@@ -92,10 +93,10 @@ bool HostedAppBrowserController::ShouldShowLocationBar() const {

if (web_contents->GetLastCommittedURL().is_empty())

return false;

- const SecurityStateModel* model =

- SecurityStateModel::FromWebContents(web_contents);

- if (model &&

- model->GetSecurityInfo().security_level ==

+ const ChromeSecurityStateModelClient* model_delegate =

+ ChromeSecurityStateModelClient::FromWebContents(web_contents);

+ if (model_delegate &&

+ model_delegate->GetSecurityInfo().security_level ==

SecurityStateModel::SECURITY_ERROR)

return true;