Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / unpacked_installer.cc

diff --git a/src/chrome/browser/extensions/unpacked_installer.cc b/src/chrome/browser/extensions/unpacked_installer.cc
index ac4d1d7..ec4b96b 100644 (file)
--- a/src/chrome/browser/extensions/unpacked_installer.cc
+++ b/src/chrome/browser/extensions/unpacked_installer.cc
@@ -14,11 +14,13 @@
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/id_util.h"
 #include "extensions/common/manifest.h"
@@ -157,11 +159,11 @@ void UnpackedInstaller::ShowInstallPrompt() {
   if (!service_weak_.get())
     return;
 
-  const ExtensionSet* disabled_extensions =
-      service_weak_->disabled_extensions();
+  const ExtensionSet& disabled_extensions =
+      ExtensionRegistry::Get(service_weak_->profile())->disabled_extensions();
   if (service_weak_->show_extensions_prompts() && prompt_for_plugins_ &&
       PluginInfo::HasPlugins(installer_.extension().get()) &&
-      !disabled_extensions->Contains(installer_.extension()->id())) {
+      !disabled_extensions.Contains(installer_.extension()->id())) {
     SimpleExtensionLoadPrompt* prompt = new SimpleExtensionLoadPrompt(
         installer_.extension().get(),
         installer_.profile(),