| Index: chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc
|
| diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc
|
| index bc647ea01eda6f542bf68420b0849d0a54c63adb..2b7551b70f5729f887efd96c5f1b63554af75812 100644
|
| --- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc
|
| +++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc
|
| @@ -6,12 +6,11 @@
|
|
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
|
| -#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_util.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "content/public/browser/notification_details.h"
|
| #include "content/public/browser/notification_source.h"
|
| -#include "extensions/browser/extension_system.h"
|
| +#include "extensions/browser/extension_registry.h"
|
| #include "extensions/browser/notification_types.h"
|
|
|
| namespace omnibox_api = extensions::api::omnibox;
|
| @@ -51,10 +50,9 @@ void KeywordExtensionsDelegateImpl::IncrementInputId() {
|
|
|
| bool KeywordExtensionsDelegateImpl::IsEnabledExtension(
|
| const std::string& extension_id) {
|
| - ExtensionService* extension_service =
|
| - extensions::ExtensionSystem::Get(profile_)->extension_service();
|
| const extensions::Extension* extension =
|
| - extension_service->GetExtensionById(extension_id, false);
|
| + extensions::ExtensionRegistry::Get(
|
| + profile_)->enabled_extensions().GetByID(extension_id);
|
| return extension &&
|
| (!profile_->IsOffTheRecord() ||
|
| !extensions::util::IsIncognitoEnabled(extension_id, profile_));
|
|
|