Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(632)

Unified Diff: chrome/browser/extensions/api/declarative_content/content_action.cc

Issue 1066993002: Make DeclarativeUserScriptManager non-shared between profiles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make DeclarativeUserScriptManager be a KeyedService. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_system_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/declarative_content/content_action.cc
diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc
index d920766888e631435a42c81fb068db9a1ec0ddcf..1a9e6aae712b000b534b31245fcb8a6c0a973810 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action.cc
@@ -20,8 +20,8 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/declarative_user_script_manager.h"
+#include "extensions/browser/declarative_user_script_manager_factory.h"
#include "extensions/browser/extension_registry.h"
-#include "extensions/browser/extension_system.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_messages.h"
#include "ui/gfx/image/image.h"
@@ -353,9 +353,8 @@ RequestContentScript::RequestContentScript(
HostID host_id(HostID::EXTENSIONS, extension->id());
InitScript(host_id, extension, script_data);
- master_ = ExtensionSystem::Get(browser_context)
- ->declarative_user_script_manager()
- ->GetDeclarativeUserScriptMasterByID(host_id);
+ master_ = DeclarativeUserScriptManagerFactory::GetForBrowserContext(
+ browser_context)->GetDeclarativeUserScriptMasterByID(host_id);
AddScript();
}
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_system_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698