chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java - Issue 1169213006: Make ConnectionSecurityHelper a namespace instead of a class

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_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java

Issue 1169213006: Make ConnectionSecurityHelper a namespace instead of a class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 6 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/ssl/ConnectionSecurityHelper.java ('k') | chrome/android/java_staging/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java

diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java

index 0b352c49bb41d8fffe4e9fe2bc404af1b2c8432e..0fbe904f273fed616319343739b1e25ce78e8d4a 100644

--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java

+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java

@@ -50,7 +50,7 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;

import org.chromium.chrome.browser.preferences.bandwidth.BandwidthReductionPreferences;

import org.chromium.chrome.browser.preferences.bandwidth.DataReductionPromoScreen;

import org.chromium.chrome.browser.signin.SigninPromoScreen;

-import org.chromium.chrome.browser.ssl.ConnectionSecurityHelperSecurityLevel;

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

import org.chromium.chrome.browser.tabmodel.SingleTabModelSelector;

import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;

import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;

@@ -730,10 +730,9 @@ public class DocumentActivity extends CompositorChromeActivity {

private boolean hasSecurityWarningOrError(Tab tab) {

int securityLevel = tab.getSecurityLevel();

- return securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR

- || securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING

- || securityLevel

- == ConnectionSecurityHelperSecurityLevel.SECURITY_POLICY_WARNING;

+ return securityLevel == ConnectionSecurityLevel.SECURITY_ERROR

+ || securityLevel == ConnectionSecurityLevel.SECURITY_WARNING

+ || securityLevel == ConnectionSecurityLevel.SECURITY_POLICY_WARNING;

}

});