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

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

Issue 5730004: Rename ExtensionsService to ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 10 years 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
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 b3fbbe798d5baa8a24a9d3b40d7ec90919714dd4..3f448b914189143384edba1a1c8d3eddee073f5f 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -15,7 +15,7 @@
#include "base/string_util.h"
#include "base/thread.h"
#include "base/version.h"
-#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_resource.h"
@@ -339,9 +339,9 @@ void UserScriptMaster::Observe(NotificationType type,
case NotificationType::EXTENSION_LOADED: {
// Add any content scripts inside the extension.
const Extension* extension = Details<const Extension>(details).ptr();
- bool incognito_enabled = profile_->GetExtensionsService()->
+ bool incognito_enabled = profile_->GetExtensionService()->
IsIncognitoEnabled(extension);
- bool allow_file_access = profile_->GetExtensionsService()->
+ bool allow_file_access = profile_->GetExtensionService()->
AllowFileAccess(extension);
const UserScriptList& scripts = extension->content_scripts();
for (UserScriptList::const_iterator iter = scripts.begin();
@@ -374,9 +374,9 @@ void UserScriptMaster::Observe(NotificationType type,
case NotificationType::EXTENSION_USER_SCRIPTS_UPDATED: {
const Extension* extension = Details<const Extension>(details).ptr();
UserScriptList new_lone_scripts;
- bool incognito_enabled = profile_->GetExtensionsService()->
+ bool incognito_enabled = profile_->GetExtensionService()->
IsIncognitoEnabled(extension);
- bool allow_file_access = profile_->GetExtensionsService()->
+ bool allow_file_access = profile_->GetExtensionService()->
AllowFileAccess(extension);
for (UserScriptList::iterator iter = lone_scripts_.begin();
iter != lone_scripts_.end(); ++iter) {
« no previous file with comments | « chrome/browser/extensions/user_script_listener_unittest.cc ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698