chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappActivity.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/webapps/WebappActivity.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_staging/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.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/webapps/WebappActivity.java

diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappActivity.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappActivity.java

index a953abf769507c0a57728262e48e8d8b2f2d43b3..e97d4f13882dbf2dff8eff1b76a24e4ca11afdb3 100644

--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappActivity.java

+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappActivity.java

@@ -27,7 +27,7 @@ import org.chromium.chrome.browser.TabObserver;

import org.chromium.chrome.browser.UrlUtilities;

import org.chromium.chrome.browser.document.DocumentUtils;

import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;

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

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

import org.chromium.chrome.browser.util.FeatureUtilities;

import org.chromium.content.browser.ScreenOrientationProvider;

import org.chromium.content_public.browser.LoadUrlParams;

@@ -307,9 +307,8 @@ public class WebappActivity extends FullScreenActivity {

if (!TextUtils.isEmpty(url)) {

boolean isSameWebsite =

UrlUtilities.sameDomainOrHost(mWebappInfo.uri().toString(), url, true);

- visible = !isSameWebsite

- || securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR

- || securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING;

+ visible = !isSameWebsite || securityLevel == ConnectionSecurityLevel.SECURITY_ERROR

+ || securityLevel == ConnectionSecurityLevel.SECURITY_WARNING;

}

return visible;