Chromium Code Reviews| 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..16aeb27fe988e3ebe11652f215c00fb1572c2df8 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 URL is used as the first suggestion for zero-suggest. */ |
| + static String sVerbatimUrl; |
| + |
| private static SearchWidgetTemplateUrlServiceObserver sObserver; |
| private static SearchWidgetProviderDelegate sDelegate; |
| @@ -291,6 +295,11 @@ 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()); |
| + sVerbatimUrl = LocationBarLayout.splitPathFromUrlDisplayText(searchEngineUrl).first; |
|
Ted C
2017/04/26 20:21:52
Should this be sDefaultSearchEngineUrl?
Seems lik
gone
2017/04/26 21:45:15
Done.
|
| + |
| updateCachedEngineName(service.getDefaultSearchEngineTemplateUrl().getShortName()); |
| } |