| Index: chrome/browser/ui/search/instant_controller.cc
|
| diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc
|
| index 4c7e5c1d8c8df55cc4118a78de60d0ca0561c1d9..5fff7738ea74e64cc2ef6e1442c504be9f68a6cc 100644
|
| --- a/chrome/browser/ui/search/instant_controller.cc
|
| +++ b/chrome/browser/ui/search/instant_controller.cc
|
| @@ -535,13 +535,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())
|
| @@ -610,22 +603,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()) {
|
|
|