chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java - Issue 1539043002: Pull SecurityStateModel out into a component

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/customtabs/CustomTabObserver.java

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 11 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/chrome_apk.gyp ('k') | chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java

index 38c1f555feb605678b8446f7fa582f69db3575c9..b303b120eac96d955a00ad1edb54b3334798a7c8 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java

@@ -10,10 +10,10 @@ import android.os.SystemClock;

import android.support.customtabs.CustomTabsCallback;

import org.chromium.base.metrics.RecordHistogram;

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

import org.chromium.chrome.browser.tab.EmptyTabObserver;

import org.chromium.chrome.browser.tab.Tab;

import org.chromium.chrome.browser.tab.TabObserver;

+import org.chromium.components.security_state.ConnectionSecurityLevel;

import org.chromium.content_public.browser.LoadUrlParams;

import java.util.concurrent.TimeUnit;

@@ -114,4 +114,4 @@ class CustomTabObserver extends EmptyTabObserver {

mCurrentState = STATE_RESET;

mIntentReceivedTimestamp = -1;

}