🔍 Introduce default search engine dialog

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java

Index: chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java
index d66b67a895749d92f06cd713b45aa8d089e18ff1..99e54887960dfb7499c5e3a15a5ceb7360eceaee 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java
@@ -28,6 +28,7 @@ import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
+import org.chromium.chrome.browser.omnibox.LocationBarLayout;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.LoadListener;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrlServiceObserver;
@@ -123,6 +124,9 @@ public class SearchWidgetProvider extends AppWidgetProvider {
     private static final Object DELEGATE_LOCK = new Object();
     private static final Object OBSERVER_LOCK = new Object();
 
+    /** The default search engine's root URL. */
+    private static String sDefaultSearchEngineUrl;
+
     private static SearchWidgetTemplateUrlServiceObserver sObserver;
     private static SearchWidgetProviderDelegate sDelegate;
 
@@ -291,6 +295,12 @@ public class SearchWidgetProvider extends AppWidgetProvider {
         TemplateUrlService service = TemplateUrlService.getInstance();
         if (!service.isLoaded()) return;
 
+        // Update the URL that we show for zero-suggest.
+        String searchEngineUrl = service.getSearchEngineUrlFromTemplateUrl(
+                service.getDefaultSearchEngineTemplateUrl().getKeyword());
+        sDefaultSearchEngineUrl =
+                LocationBarLayout.splitPathFromUrlDisplayText(searchEngineUrl).first;
+
         updateCachedEngineName(service.getDefaultSearchEngineTemplateUrl().getShortName());
     }
 
@@ -383,4 +393,9 @@ public class SearchWidgetProvider extends AppWidgetProvider {
         assert sDelegate == null;
         sDelegate = delegate;
     }
+
+    /** See {@link #sDefaultSearchEngineUrl}. */
+    static String getDefaultSearchEngineUrl() {
+        return sDefaultSearchEngineUrl;

[Ted C, 2017/04/27 16:40:46]

can/should this ever be null?  Wondering if we should assert that
updateCachedEngineName was called first (even if this doesn't change the
existing behavior we should add checks to ensure that was correct).

[gone, 2017/04/27 17:48:52]

This was added by Yusuf for showing the engine's URL as an autocomplete
suggestion, IIRC.  I don't think it's safe to assert null here, but if it's null
nothing seems to break.

+    }
 }