summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/search/instant_controller.cc
diff options
context:
space:
mode:
authorjered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 18:31:15 +0000
committerjered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 18:31:15 +0000
commite1290ee6dbf99adb2d189a81ccaddf0441241d7b (patch)
treebe5baa8c247fa5936ddfc5c7fe19acb3d5e58132 /chrome/browser/ui/search/instant_controller.cc
parentc60d2def93b0a4f9bcc51317a9900c2d7e62ac0d (diff)
downloadchromium_src-e1290ee6dbf99adb2d189a81ccaddf0441241d7b.zip
chromium_src-e1290ee6dbf99adb2d189a81ccaddf0441241d7b.tar.gz
chromium_src-e1290ee6dbf99adb2d189a81ccaddf0441241d7b.tar.bz2
Remove Instant hooks from SearchProvider.
Old Instant is gone, and InstantExtended is not cramming its suggestion into autocomplete this way. BUG=251262 TEST=Unit test and manually. Review URL: https://chromiumcodereview.appspot.com/17391005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/search/instant_controller.cc')
-rw-r--r--chrome/browser/ui/search/instant_controller.cc23
1 files changed, 0 insertions, 23 deletions
diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc
index ad7e785..4620242 100644
--- a/chrome/browser/ui/search/instant_controller.cc
+++ b/chrome/browser/ui/search/instant_controller.cc
@@ -548,13 +548,6 @@ bool InstantController::Update(const AutocompleteMatch& match,
return true;
}
-bool InstantController::WillFetchCompletions() const {
- if (!extended_enabled())
- return false;
-
- return !UsingLocalPage();
-}
-
scoped_ptr<content::WebContents> InstantController::ReleaseNTPContents() {
if (!extended_enabled() || !browser_->profile() ||
browser_->profile()->IsOffTheRecord() ||
@@ -624,22 +617,6 @@ void InstantController::HandleAutocompleteResults(
if (omnibox_focus_state_ == OMNIBOX_FOCUS_NONE)
return;
- for (ACProviders::const_iterator provider = providers.begin();
- provider != providers.end(); ++provider) {
- const bool from_search_provider =
- (*provider)->type() == AutocompleteProvider::TYPE_SEARCH;
-
- // TODO(jeremycho): Pass search_provider() as a parameter to this function
- // and remove the static cast.
- const bool provider_done = from_search_provider ?
- static_cast<SearchProvider*>(*provider)->IsNonInstantSearchDone() :
- (*provider)->done();
- if (!provider_done) {
- DVLOG(1) << "Waiting for " << (*provider)->GetName();
- return;
- }
- }
-
DVLOG(1) << "AutocompleteResults:";
std::vector<InstantAutocompleteResult> results;
if (UsingLocalPage()) {