diff options
| author | samarth@chromium.org <samarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 22:43:07 +0000 |
|---|---|---|
| committer | samarth@chromium.org <samarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 22:43:07 +0000 |
| commit | 3b742d48691782b63415dcb529d9d7662f2b746e (patch) | |
| tree | 28fddd79fad6da6fabd58296f0325ff5d86af6f6 | |
| parent | 4cd398acd1bfee761c2fc61f833d0b75b4d11ade (diff) | |
| download | chromium_src-3b742d48691782b63415dcb529d9d7662f2b746e.zip chromium_src-3b742d48691782b63415dcb529d9d7662f2b746e.tar.gz chromium_src-3b742d48691782b63415dcb529d9d7662f2b746e.tar.bz2 | |
Also check for provider types before creating ZeroSuggestProvider.
TESTED=ZeroSuggest still works when enabled.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10966036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158104 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_controller.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc index 14bf7c1f..736be026 100644 --- a/chrome/browser/autocomplete/autocomplete_controller.cc +++ b/chrome/browser/autocomplete/autocomplete_controller.cc @@ -131,9 +131,10 @@ AutocompleteController::AutocompleteController( providers_.push_back(new ShortcutsProvider(this, profile)); // Create ZeroSuggest if it is enabled. - zero_suggest_provider_ = ZeroSuggestProvider::Create(this, profile); - if (zero_suggest_provider_) { - providers_.push_back(zero_suggest_provider_); + if (provider_types & AutocompleteProvider::TYPE_ZERO_SUGGEST) { + zero_suggest_provider_ = ZeroSuggestProvider::Create(this, profile); + if (zero_suggest_provider_) + providers_.push_back(zero_suggest_provider_); } for (ACProviders::iterator i(providers_.begin()); i != providers_.end(); ++i) |