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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java

Issue 2838833002: 🔍 Introduce default search engine dialog (Closed)
Patch Set: COmments Created 3 years, 8 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
Index: chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java
index 66ad59579eb6504c686f8f6d19d7e78ed7aaf254..feb74f3640e9eb6ed84662bd43124f5313169577 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java
@@ -6,14 +6,11 @@ package org.chromium.chrome.browser.searchwidget;
import org.chromium.base.library_loader.LibraryLoader;
import org.chromium.chrome.browser.ntp.NewTabPage;
-import org.chromium.chrome.browser.omnibox.LocationBarLayout;
-import org.chromium.chrome.browser.search_engines.TemplateUrlService;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
-class SearchBoxDataProvider implements ToolbarDataProvider, TemplateUrlService.LoadListener {
+class SearchBoxDataProvider implements ToolbarDataProvider {
private Tab mTab;
- private String mVerbatimUrl;
/**
* Called when native library is loaded and a tab has been initialized.
@@ -21,22 +18,7 @@ class SearchBoxDataProvider implements ToolbarDataProvider, TemplateUrlService.L
*/
public void onNativeLibraryReady(Tab tab) {
assert LibraryLoader.isInitialized();
-
mTab = tab;
-
- TemplateUrlService service = TemplateUrlService.getInstance();
- service.registerLoadListener(this);
- service.load();
- }
-
- @Override
- public void onTemplateUrlServiceLoaded() {
- // For zero suggest, the default search engine's URL is used as the first suggestion.
- TemplateUrlService service = TemplateUrlService.getInstance();
- service.unregisterLoadListener(this);
- String searchEngineUrl = service.getSearchEngineUrlFromTemplateUrl(
- service.getDefaultSearchEngineTemplateUrl().getKeyword());
- mVerbatimUrl = LocationBarLayout.splitPathFromUrlDisplayText(searchEngineUrl).first;
}
@Override
@@ -72,6 +54,6 @@ class SearchBoxDataProvider implements ToolbarDataProvider, TemplateUrlService.L
@Override
public String getCurrentUrl() {
- return mVerbatimUrl;
+ return SearchWidgetProvider.getDefaultSearchEngineUrl();
}
}

Powered by Google App Engine
This is Rietveld 408576698