Index: chrome/browser/search_engines/template_url_service.cc |
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc |
index 27e123c4f8bf0c85e6ba30efa578a1ebaaaec25c..b472533f0aa545b2fe1b8ce2d943f663ba1bd5a2 100644 |
--- a/chrome/browser/search_engines/template_url_service.cc |
+++ b/chrome/browser/search_engines/template_url_service.cc |
@@ -436,7 +436,8 @@ void TemplateURLService::RemoveAutoGeneratedForOriginBetween( |
} |
-void TemplateURLService::RegisterExtensionKeyword(const Extension* extension) { |
+void TemplateURLService::RegisterExtensionKeyword( |
+ const extensions::Extension* extension) { |
// TODO(mpcomplete): disable the keyword when the extension is disabled. |
if (extension->omnibox_keyword().empty()) |
return; |
@@ -460,7 +461,7 @@ void TemplateURLService::RegisterExtensionKeyword(const Extension* extension) { |
} |
void TemplateURLService::UnregisterExtensionKeyword( |
- const Extension* extension) { |
+ const extensions::Extension* extension) { |
if (loaded_) { |
TemplateURL* url = GetTemplateURLForExtension(extension); |
if (url) |
@@ -474,7 +475,7 @@ void TemplateURLService::UnregisterExtensionKeyword( |
} |
TemplateURL* TemplateURLService::GetTemplateURLForExtension( |
- const Extension* extension) { |
+ const extensions::Extension* extension) { |
for (TemplateURLVector::const_iterator i = template_urls_.begin(); |
i != template_urls_.end(); ++i) { |
if ((*i)->IsExtensionKeyword() && |
@@ -1397,7 +1398,7 @@ void TemplateURLService::NotifyLoaded() { |
for (PendingExtensionIDs::const_iterator i(pending_extension_ids_.begin()); |
i != pending_extension_ids_.end(); ++i) { |
- const Extension* extension = |
+ const extensions::Extension* extension = |
profile_->GetExtensionService()->GetExtensionById(*i, true); |
if (extension) |
RegisterExtensionKeyword(extension); |