chrome/browser/extensions/user_script_master.cc - Issue 11365181: Remove GetExtensionService from Profile.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/user_script_master.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: replace missing extension_system include Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/extensions/user_script_master.cc

diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc

index cc21440ce098c2f00cfa1076696f2efa9599f32a..5f0988c0c033c128dbaab16e7fb5139d7d1466fd 100644

--- a/chrome/browser/extensions/user_script_master.cc

+++ b/chrome/browser/extensions/user_script_master.cc

@@ -17,6 +17,7 @@

#include "base/threading/thread.h"

#include "base/version.h"

#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/extensions/extension.h"

@@ -359,8 +360,8 @@ void UserScriptMaster::Observe(int type,

extensions_info_[extension->id()] =

ExtensionSet::ExtensionPathAndDefaultLocale(

extension->path(), extension->default_locale());

- bool incognito_enabled = profile_->GetExtensionService()->

- IsIncognitoEnabled(extension->id());

+ bool incognito_enabled = extensions::ExtensionSystem::Get(profile_)->

+ extension_service()->IsIncognitoEnabled(extension->id());

const UserScriptList& scripts = extension->content_scripts();

for (UserScriptList::const_iterator iter = scripts.begin();

iter != scripts.end(); ++iter) {