Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/Tab.java

Issue 1169213006: Make ConnectionSecurityHelper a namespace instead of a class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: chrome/android/java/src/org/chromium/chrome/browser/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
index 279e5e24bd9383a1cdcfc87d6a25544eb07eab4d..d404b548399aac4b696e3491448f915c75929482 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -42,8 +42,8 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
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.ssl.ConnectionSecurityHelper;
-import org.chromium.chrome.browser.ssl.ConnectionSecurityHelperSecurityLevel;
+import org.chromium.chrome.browser.ssl.ConnectionSecurityStatus;
+import org.chromium.chrome.browser.ssl.ConnectionSecurityStatusSecurityLevel;
import org.chromium.chrome.browser.tab.SadTabViewFactory;
import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
@@ -1154,11 +1154,11 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
}
/**
- * @return The current {@link ConnectionSecurityHelperSecurityLevel} for the tab.
+ * @return The current {@link ConnectionSecurityStatusSecurityLevel} for the tab.
*/
// TODO(tedchoc): Remove this and transition all clients to use ToolbarModel directly.
public int getSecurityLevel() {
- return ConnectionSecurityHelper.getSecurityLevelForWebContents(getWebContents());
+ return ConnectionSecurityStatus.getSecurityLevelForWebContents(getWebContents());
}
/**
@@ -2463,8 +2463,8 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
int securityState = getSecurityLevel();
enableHidingTopControls &=
- (securityState != ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR
- && securityState != ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING);
+ (securityState != ConnectionSecurityStatusSecurityLevel.SECURITY_ERROR
+ && securityState != ConnectionSecurityStatusSecurityLevel.SECURITY_WARNING);
enableHidingTopControls &=
!AccessibilityUtil.isAccessibilityEnabled(getApplicationContext());

Powered by Google App Engine
This is Rietveld 408576698