chrome/browser/ui/toolbar/toolbar_model_impl.h - Issue 1314843007: Refactor connection_security into SecurityStateModel

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/toolbar/toolbar_model_impl.h

Issue 1314843007: Refactor connection_security into SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase fix up and other cleanups Created 5 years, 4 months 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/toolbar/test_toolbar_model.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.cc » ('j') | content/public/browser/web_contents_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/toolbar_model_impl.h

diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.h b/chrome/browser/ui/toolbar/toolbar_model_impl.h

index aa5089607a2a09b0ea9a3c8b92e96401c8917d02..3bca88e459bcc63868efa175cf698ff79596e47c 100644

--- a/chrome/browser/ui/toolbar/toolbar_model_impl.h

+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.h

@@ -40,7 +40,7 @@ class ToolbarModelImpl : public ChromeToolbarModel {

base::string16 GetCorpusNameForMobile() const override;

GURL GetURL() const override;

bool WouldPerformSearchTermReplacement(bool ignore_editing) const override;

- connection_security::SecurityLevel GetSecurityLevel(

+ SecurityStateModel::SecurityLevel GetSecurityLevel(

bool ignore_editing) const override;

int GetIcon() const override;

base::string16 GetEVCertName() const override;

@@ -48,7 +48,7 @@ class ToolbarModelImpl : public ChromeToolbarModel {

// As |GetIcon()|, but returns the icon only taking into account the security

// level| given, ignoring search term replacement state.

- int GetIconForSecurityLevel(connection_security::SecurityLevel level) const;

+ int GetIconForSecurityLevel(SecurityStateModel::SecurityLevel level) const;

// Returns the navigation controller used to retrieve the navigation entry

// from which the states are retrieved.