summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/search
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/search')
-rw-r--r--chrome/browser/ui/search/instant_controller.cc23
-rw-r--r--chrome/browser/ui/search/instant_controller.h4
2 files changed, 0 insertions, 27 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()) {
diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
index 716f37e..c9ead54 100644
--- a/chrome/browser/ui/search/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -110,10 +110,6 @@ class InstantController : public InstantPage::Delegate,
bool escape_pressed,
bool is_keyword_search);
- // Returns whether the Instant page currently being used will fetch its own
- // completions. True for extended mode, unless using a local Instant page.
- bool WillFetchCompletions() const;
-
// Releases and returns the NTP WebContents. May be NULL. Loads a new
// WebContents for the NTP.
scoped_ptr<content::WebContents> ReleaseNTPContents() WARN_UNUSED_RESULT;