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

Unified Diff: chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/HostedToolbar.java

Issue 1157433002: Make it possible to load a new Url in hosted mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed call and added security state to http scheme emphasis logic Created 5 years, 7 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/hosted/HostedContentHandler.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/HostedToolbar.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/HostedToolbar.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/HostedToolbar.java
index bba90f0896bd96419ddf121dbc138a8a4bc42cb4..7677010d10f9fd311b3226a4a637fb2c035786bb 100644
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/HostedToolbar.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/HostedToolbar.java
@@ -116,7 +116,13 @@ public class HostedToolbar extends ToolbarLayout implements LocationBar {
@Override
public boolean shouldEmphasizeHttpsScheme() {
- return !mUseDarkColors;
+ int securityLevel = getSecurityLevel();
+ if (securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR
+ || securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING
+ || securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_POLICY_WARNING) {
+ return true;
+ }
+ return false;
}
@Override
@@ -170,6 +176,7 @@ public class HostedToolbar extends ToolbarLayout implements LocationBar {
@Override
public void updateLoadingState(boolean updateUrl) {
+ if (updateUrl) setUrlToPageUrl();
updateSecurityIcon(getSecurityLevel());
}
« no previous file with comments | « chrome/android/java_staging/src/org/chromium/chrome/browser/hosted/HostedContentHandler.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698