Upstream version 5.34.104.0

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

diff --git a/src/chrome/browser/extensions/navigation_observer.cc b/src/chrome/browser/extensions/navigation_observer.cc
index a4ef5c7..252d0bc 100644 (file)
--- a/src/chrome/browser/extensions/navigation_observer.cc
+++ b/src/chrome/browser/extensions/navigation_observer.cc
@@ -6,12 +6,13 @@
 
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_system.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
@@ -56,10 +57,10 @@ void NavigationObserver::PromptToEnableExtensionIfNecessary(
   if (!nav_entry)
     return;
 
-  ExtensionService* extension_service =
-      extensions::ExtensionSystem::Get(profile_)->extension_service();
-  const Extension* extension = extension_service->disabled_extensions()->
-      GetExtensionOrAppByURL(nav_entry->GetURL());
+  ExtensionRegistry* registry = extensions::ExtensionRegistry::Get(profile_);
+  const Extension* extension =
+      registry->disabled_extensions().GetExtensionOrAppByURL(
+          nav_entry->GetURL());
   if (!extension)
     return;
 
@@ -68,6 +69,8 @@ void NavigationObserver::PromptToEnableExtensionIfNecessary(
     return;
   prompted_extensions_.insert(extension->id());
 
+  ExtensionService* extension_service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
   ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
   if (extension_prefs->DidExtensionEscalatePermissions(extension->id())) {
     // Keep track of the extension id and nav controller we're prompting for.