| Index: chrome/browser/autocomplete/autocomplete_popup_model.cc
|
| diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc
|
| index 6b4384eaa725e18d2c440f90a73c4ab880d23c76..e7c143c23f2fe9d2153d22f63395010548b280b6 100644
|
| --- a/chrome/browser/autocomplete/autocomplete_popup_model.cc
|
| +++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc
|
| @@ -12,7 +12,7 @@
|
| #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
|
| #include "chrome/browser/autocomplete/search_provider.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/extensions/extensions_service.h"
|
| +#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/search_engines/template_url.h"
|
| #include "chrome/browser/search_engines/template_url_model.h"
|
| #include "chrome/common/notification_service.h"
|
| @@ -224,11 +224,11 @@ bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match,
|
|
|
| // Don't provide a hint for inactive/disabled extension keywords.
|
| if (template_url->IsExtensionKeyword()) {
|
| - const Extension* extension = profile_->GetExtensionsService()->
|
| + const Extension* extension = profile_->GetExtensionService()->
|
| GetExtensionById(template_url->GetExtensionId(), false);
|
| if (!extension ||
|
| (profile_->IsOffTheRecord() &&
|
| - !profile_->GetExtensionsService()->IsIncognitoEnabled(extension)))
|
| + !profile_->GetExtensionService()->IsIncognitoEnabled(extension)))
|
| return false;
|
| }
|
|
|
| @@ -322,6 +322,6 @@ const SkBitmap* AutocompletePopupModel::GetSpecialIconForMatch(
|
| if (!match.template_url || !match.template_url->IsExtensionKeyword())
|
| return NULL;
|
|
|
| - return &profile_->GetExtensionsService()->GetOmniboxPopupIcon(
|
| + return &profile_->GetExtensionService()->GetOmniboxPopupIcon(
|
| match.template_url->GetExtensionId());
|
| }
|
|
|