summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/ui/webui/settings/font_handler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/ui/webui/settings/font_handler.cc')
-rw-r--r--chromium/chrome/browser/ui/webui/settings/font_handler.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/chrome/browser/ui/webui/settings/font_handler.cc b/chromium/chrome/browser/ui/webui/settings/font_handler.cc
index 2c25ebed0da..062eb45fb0f 100644
--- a/chromium/chrome/browser/ui/webui/settings/font_handler.cc
+++ b/chromium/chrome/browser/ui/webui/settings/font_handler.cc
@@ -21,7 +21,6 @@
#include "components/prefs/pref_service.h"
#include "content/public/browser/font_list_async.h"
#include "content/public/browser/web_ui.h"
-#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension_urls.h"
@@ -39,7 +38,7 @@ const char kAdvancedFontSettingsExtensionId[] =
namespace settings {
FontHandler::FontHandler(content::WebUI* webui)
- : extension_registry_observer_(this), profile_(Profile::FromWebUI(webui)) {
+ : profile_(Profile::FromWebUI(webui)) {
#if defined(OS_MACOSX)
// Perform validation for saved fonts.
settings_utils::ValidateSavedFonts(profile_->GetPrefs());
@@ -103,7 +102,9 @@ const extensions::Extension* FontHandler::GetAdvancedFontSettingsExtension() {
extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!service->IsExtensionEnabled(kAdvancedFontSettingsExtensionId))
return nullptr;
- return service->GetInstalledExtension(kAdvancedFontSettingsExtensionId);
+ extensions::ExtensionRegistry* registry =
+ extensions::ExtensionRegistry::Get(profile_);
+ return registry->GetInstalledExtension(kAdvancedFontSettingsExtensionId);
}
void FontHandler::NotifyAdvancedFontSettingsAvailability() {