chrome/browser/ui/android/toolbar/toolbar_model_android.cc - Issue 1124383007: Revert of Revert of Move SecurityLevel into a class of its own

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/android/toolbar/toolbar_model_android.cc

Issue 1124383007: Revert of Revert of Move SecurityLevel into a class of its own (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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/ssl/connection_security_helper_android.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/toolbar/toolbar_model_android.cc

diff --git a/chrome/browser/ui/android/toolbar/toolbar_model_android.cc b/chrome/browser/ui/android/toolbar/toolbar_model_android.cc

index d7437c3fd20851e137d7bb2e5c7b1ee7d4d95086..2ce0ed4cd0f0c7d538885c55fec6fd92ab098e38 100644

--- a/chrome/browser/ui/android/toolbar/toolbar_model_android.cc

+++ b/chrome/browser/ui/android/toolbar/toolbar_model_android.cc

@@ -70,16 +70,6 @@

return reinterpret_cast<intptr_t>(toolbar_model);

}

-// static

-jint GetSecurityLevelForWebContents(JNIEnv* env,

- jclass jcaller,

- jobject jweb_contents) {

- content::WebContents* web_contents =

- content::WebContents::FromJavaWebContents(jweb_contents);

- DCHECK(web_contents);

- return ToolbarModelImpl::GetSecurityLevelForWebContents(web_contents);

// Temporary method to allow us to surface a SHA-1 deprecation string on Android

// in M42. This duplicates a subset of the logic from

// ToolbarModelImpl::GetSecurityLevelForWebContents() and