| 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 530c6d8930e1792618664a7fd55a7878f823e72d..7d53ec7bd7d637a98c7c3ced49ba95bfe3d4f8c3 100644
|
| --- a/chrome/browser/search_engines/template_url_service.cc
|
| +++ b/chrome/browser/search_engines/template_url_service.cc
|
| @@ -416,7 +416,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;
|
| @@ -440,7 +441,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)
|
| @@ -454,7 +455,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() &&
|
| @@ -1359,7 +1360,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);
|
|
|