chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java - Issue 1314843007: Refactor connection_security into SecurityStateModel

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/tab/Tab.java

Issue 1314843007: Refactor connection_security into SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add SecurityStateModel browser tests; update toolbar model unit tests Created 5 years, 4 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

« chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/ssl/SecurityStateModel.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java » ('j') | chrome/browser/ssl/security_state_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

index 3153d42626bd0cbf164e4a4ca14ee68c00d39f47..7b93acc76de28dfeb6b56b99b4b06eb2fd978f7f 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

@@ -57,8 +57,8 @@ import org.chromium.chrome.browser.metrics.UmaUtils;

import org.chromium.chrome.browser.printing.TabPrinter;

import org.chromium.chrome.browser.profiles.Profile;

import org.chromium.chrome.browser.snackbar.SnackbarManager;

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

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

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

import org.chromium.chrome.browser.tab.TabUma.TabCreationState;

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

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

@@ -459,6 +459,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,

@Override

public void visibleSSLStateChanged() {

+ SecurityStateModel.securityStateChanged(getWebContents());

for (TabObserver observer : mObservers) observer.onSSLStateUpdated(Tab.this);

}

@@ -1218,7 +1219,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,

// TODO(tedchoc): Remove this and transition all clients to use ToolbarModel directly.

public int getSecurityLevel() {

- return ConnectionSecurity.getSecurityLevelForWebContents(getWebContents());

+ return SecurityStateModel.getSecurityLevelForWebContents(getWebContents());

}

/**