Bug 1517160 - Use correct icon path for internal about pages r=geckoview-reviewers,esawin#geckoview-reviewers
authorJames Willcox <snorp@snorp.net>
Mon, 21 Jan 2019 09:50:16 +0000
changeset 514840 8ba5964567a64f6a09b4de8ea4f8e8d151958f00
parent 514839 75dc8b3cc9a3fa4895cd10516de341fa4fee1957
child 514841 e26eda77b71c6c02db69441236dd95fc0db5c7f2
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgeckoview-reviewers, esawin
bugs1517160
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1517160 - Use correct icon path for internal about pages r=geckoview-reviewers,esawin#geckoview-reviewers Differential Revision: https://phabricator.services.mozilla.com/D16991
mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconsHelper.java
mobile/android/base/java/org/mozilla/gecko/icons/preparation/AboutPagesPreparer.java
--- a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconsHelper.java
+++ b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconsHelper.java
@@ -37,17 +37,17 @@ public class TestIconsHelper {
                 IconsHelper.guessDefaultFaviconURL("about:firefox"));
 
         Assert.assertEquals(
                 "about:addons",
                 IconsHelper.guessDefaultFaviconURL("about:addons"));
 
         // Non http(s) URLS
 
-        final String jarUrl = GeckoJarReader.getJarURL(RuntimeEnvironment.application, "chrome/chrome/content/branding/favicon64.png");
+        final String jarUrl = GeckoJarReader.getJarURL(RuntimeEnvironment.application, "chrome/geckoview/content/branding/favicon64.png");
         Assert.assertEquals(jarUrl, IconsHelper.guessDefaultFaviconURL(jarUrl));
 
         Assert.assertNull(IconsHelper.guessDefaultFaviconURL("content://some.random.provider/icons"));
 
         Assert.assertNull(IconsHelper.guessDefaultFaviconURL("ftp://ftp.public.mozilla.org/this/is/made/up"));
 
         Assert.assertNull(IconsHelper.guessDefaultFaviconURL("file:///"));
 
--- a/mobile/android/base/java/org/mozilla/gecko/icons/preparation/AboutPagesPreparer.java
+++ b/mobile/android/base/java/org/mozilla/gecko/icons/preparation/AboutPagesPreparer.java
@@ -22,16 +22,16 @@ public class AboutPagesPreparer implemen
 
     public AboutPagesPreparer() {
         aboutUrls = new HashSet<>(AboutPages.DEFAULT_ICON_PAGES);
     }
 
     @Override
     public void prepare(IconRequest request) {
         if (aboutUrls.contains(request.getPageUrl())) {
-            final String iconUrl = GeckoJarReader.getJarURL(request.getContext(), "chrome/chrome/content/branding/favicon64.png");
+            final String iconUrl = GeckoJarReader.getJarURL(request.getContext(), "chrome/geckoview/content/branding/favicon64.png");
 
             request.modify()
                     .icon(IconDescriptor.createLookupIcon(iconUrl))
                     .deferBuild();
         }
     }
 }