chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java - Issue 1123943002: 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/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java

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

Patch Set: more android build fixes 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/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java » ('j') | chrome/browser/ssl/security_level_policy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java

index a2354dad1c93704414dc9171ee743f608de97185..d78db7e590486f30d8d82e944c4d1e0a41c9f2eb 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java

@@ -5,7 +5,7 @@

package org.chromium.chrome.browser.toolbar;

import org.chromium.base.CalledByNative;

-import org.chromium.chrome.browser.ui.toolbar.ToolbarModelSecurityLevel;

+import org.chromium.chrome.browser.ssl.SecurityLevelPolicySecurityLevel;

import org.chromium.content_public.browser.WebContents;

/**

@@ -30,12 +30,12 @@ public class ToolbarModel {

* Fetch the security level for a given web contents.

* @param webContents The web contents to get the security level for.

- * @return The ToolbarModelSecurityLevel for the specified web contents.

+ * @return The SecurityLevelPolicySecurityLevel for the specified web contents.

- * @see ToolbarModelSecurityLevel

+ * @see SecurityLevelPolicySecurityLevel

public static int getSecurityLevelForWebContents(WebContents webContents) {

- if (webContents == null) return ToolbarModelSecurityLevel.NONE;

+ if (webContents == null) return SecurityLevelPolicySecurityLevel.NONE;

return nativeGetSecurityLevelForWebContents(webContents);

}