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

Unified Diff: chrome/browser/autocomplete/search_provider.cc

Issue 11262015: Remove unused / unnecessary stuff from Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove SuggestedTextView entirely Created 8 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/autocomplete/search_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/search_provider.cc
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 676a85ca30b15dbe9e1d51e831c7ae4e5dd04369..f056c26b9970e97e6d41a0117057398cf86f0fe7 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -700,7 +700,7 @@ bool SearchProvider::ParseSuggestResults(Value* root_val, bool is_keyword) {
extras->GetList("google:suggesttype", &types);
// Only accept relevance suggestions if Instant is disabled.
- if (!is_keyword && !InstantController::IsSuggestEnabled(profile_)) {
+ if (!is_keyword && !InstantController::IsInstantEnabled(profile_)) {
// Discard this list if its size does not match that of the suggestions.
if (extras->GetList("google:suggestrelevance", &relevances) &&
relevances->GetSize() != results->GetSize())
@@ -1258,5 +1258,5 @@ void SearchProvider::UpdateDone() {
// pending, and we're not waiting on instant.
done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) &&
(instant_finalized_ ||
- !InstantController::IsSuggestEnabled(profile_)));
+ !InstantController::IsInstantEnabled(profile_)));
}
« no previous file with comments | « no previous file | chrome/browser/autocomplete/search_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698