| Index: chrome/browser/ui/location_bar/origin_chip_info.cc
|
| diff --git a/chrome/browser/ui/location_bar/origin_chip_info.cc b/chrome/browser/ui/location_bar/origin_chip_info.cc
|
| index 923ee68cf28a637145750bd28e31307fd37427de..7fdaeb16716a990f0c5b645ccefd433b8981910f 100644
|
| --- a/chrome/browser/ui/location_bar/origin_chip_info.cc
|
| +++ b/chrome/browser/ui/location_bar/origin_chip_info.cc
|
| @@ -9,7 +9,6 @@
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_util.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/safe_browsing/client_side_detection_host.h"
|
| @@ -22,7 +21,7 @@
|
| #include "chrome/grit/generated_resources.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "extensions/browser/extension_icon_image.h"
|
| -#include "extensions/browser/extension_system.h"
|
| +#include "extensions/browser/extension_registry.h"
|
| #include "extensions/common/constants.h"
|
| #include "extensions/common/manifest_handlers/icons_handler.h"
|
| #include "grit/components_strings.h"
|
| @@ -123,8 +122,8 @@ bool OriginChipInfo::Update(const content::WebContents* web_contents,
|
|
|
| if (displayed_url_.SchemeIs(extensions::kExtensionScheme)) {
|
| const extensions::Extension* extension =
|
| - extensions::ExtensionSystem::Get(profile_)->extension_service()->
|
| - extensions()->GetExtensionOrAppByURL(displayed_url_);
|
| + extensions::ExtensionRegistry::Get(profile_)->GetExtensionById(
|
| + displayed_url_.host(), extensions::ExtensionRegistry::ENABLED);
|
|
|
| if (extension) {
|
| icon_ = IDR_EXTENSIONS_FAVICON;
|
| @@ -197,10 +196,9 @@ base::string16 OriginChip::LabelFromURLForProfile(const GURL& provided_url,
|
|
|
| // For chrome-extension URLs, return the extension name.
|
| if (url.SchemeIs(extensions::kExtensionScheme)) {
|
| - ExtensionService* service =
|
| - extensions::ExtensionSystem::Get(profile)->extension_service();
|
| const extensions::Extension* extension =
|
| - service->extensions()->GetExtensionOrAppByURL(url);
|
| + extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
|
| + url.host(), extensions::ExtensionRegistry::ENABLED);
|
| return extension ?
|
| base::UTF8ToUTF16(extension->name()) : base::UTF8ToUTF16(url.host());
|
| }
|
|
|