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

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

Issue 460313002: No chrome dependencies in KeywordProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename setter Created 6 years, 4 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/keyword_extensions_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_controller.cc
diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc
index 5fde07792e09b875efbc4e91bf822680f259aca6..9d4ffc88d8742561e3f83c7497e119ebc6d1cab4 100644
--- a/chrome/browser/autocomplete/autocomplete_controller.cc
+++ b/chrome/browser/autocomplete/autocomplete_controller.cc
@@ -31,6 +31,10 @@
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/autocomplete/keyword_extensions_delegate_impl.h"
+#endif
+
namespace {
// Converts the given match to a type (and possibly subtype) based on the AQS
@@ -195,7 +199,12 @@ AutocompleteController::AutocompleteController(
// "Tab to search" can be used on all platforms other than Android.
#if !defined(OS_ANDROID)
if (provider_types & AutocompleteProvider::TYPE_KEYWORD) {
- keyword_provider_ = new KeywordProvider(this, profile);
+ keyword_provider_ = new KeywordProvider(this, template_url_service);
+#if defined(ENABLE_EXTENSIONS)
+ keyword_provider_->set_extensions_delegate(
+ scoped_ptr<KeywordExtensionsDelegate>(
+ new KeywordExtensionsDelegateImpl(profile, keyword_provider_)));
+#endif
providers_.push_back(keyword_provider_);
}
#endif
« no previous file with comments | « no previous file | chrome/browser/autocomplete/keyword_extensions_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698