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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java

Issue 2144443002: [android] Correct the URL scheme colors in the Omnibox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to comments. Created 4 years, 5 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/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
index 92b176115fcfe30705796cfd5fb0e80354324016..600eaa7483877b55ac815eefbf5684a65ebfd42e 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
@@ -129,8 +129,8 @@ public class OmniboxUrlEmphasizerTest extends NativeLibraryTestBase {
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 4, spans.length);
- spans[0].assertIsColoredSpan("https", 0, ApiCompatibilityUtils.getColor(mResources,
- R.color.url_emphasis_start_scheme_secure));
+ spans[0].assertIsColoredSpan(
+ "https", 0, ApiCompatibilityUtils.getColor(mResources, R.color.google_green_700));
spans[1].assertIsColoredSpan("://", 5, ApiCompatibilityUtils.getColor(mResources,
R.color.url_emphasis_non_emphasized_text));
spans[2].assertIsColoredSpan("www.google.com", 8, ApiCompatibilityUtils.getColor(mResources,
@@ -179,8 +179,8 @@ public class OmniboxUrlEmphasizerTest extends NativeLibraryTestBase {
assertEquals("Unexpected number of spans:", 5, spans.length);
spans[0].assertIsStrikethroughSpan("https", 0);
- spans[1].assertIsColoredSpan("https", 0, ApiCompatibilityUtils.getColor(mResources,
- R.color.url_emphasis_start_scheme_security_error));
+ spans[1].assertIsColoredSpan(
+ "https", 0, ApiCompatibilityUtils.getColor(mResources, R.color.google_red_700));
spans[2].assertIsColoredSpan("://", 5, ApiCompatibilityUtils.getColor(mResources,
R.color.url_emphasis_non_emphasized_text));
spans[3].assertIsColoredSpan("www.google.com", 8, ApiCompatibilityUtils.getColor(mResources,
@@ -203,13 +203,12 @@ public class OmniboxUrlEmphasizerTest extends NativeLibraryTestBase {
ConnectionSecurityLevel.SECURITY_WARNING, false, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
- assertEquals("Unexpected number of spans:", 4, spans.length);
- spans[0].assertIsStrikethroughSpan("https", 0);
- spans[1].assertIsColoredSpan("https", 0, ApiCompatibilityUtils.getColor(mResources,
- R.color.url_emphasis_start_scheme_security_warning));
- spans[2].assertIsColoredSpan("://", 5, ApiCompatibilityUtils.getColor(mResources,
+ assertEquals("Unexpected number of spans:", 3, spans.length);
+ spans[0].assertIsColoredSpan("https", 0, ApiCompatibilityUtils.getColor(mResources,
+ R.color.url_emphasis_non_emphasized_text));
+ spans[1].assertIsColoredSpan("://", 5, ApiCompatibilityUtils.getColor(mResources,
R.color.url_emphasis_non_emphasized_text));
- spans[3].assertIsColoredSpan("www.dodgysite.com", 8, ApiCompatibilityUtils.getColor(
+ spans[2].assertIsColoredSpan("www.dodgysite.com", 8, ApiCompatibilityUtils.getColor(
mResources, R.color.url_emphasis_domain_and_registry));
}
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698