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

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

Issue 6772022: Make <all_urls> and file:///* in permissions trigger "Allow file access" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch for landing Created 9 years, 9 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
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 7943b6889848de93f69e81470fd5cd2e86228d6e..f038ffc6ffb5dc276dd42bf35436a0ae7492ce33 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -345,14 +345,11 @@ void UserScriptMaster::Observe(NotificationType type,
const Extension* extension = Details<const Extension>(details).ptr();
bool incognito_enabled = profile_->GetExtensionService()->
IsIncognitoEnabled(extension);
- bool allow_file_access = profile_->GetExtensionService()->
- AllowFileAccess(extension);
const UserScriptList& scripts = extension->content_scripts();
for (UserScriptList::const_iterator iter = scripts.begin();
iter != scripts.end(); ++iter) {
lone_scripts_.push_back(*iter);
lone_scripts_.back().set_incognito_enabled(incognito_enabled);
- lone_scripts_.back().set_allow_file_access(allow_file_access);
}
if (extensions_service_ready_)
StartScan();
@@ -381,13 +378,10 @@ void UserScriptMaster::Observe(NotificationType type,
UserScriptList new_lone_scripts;
bool incognito_enabled = profile_->GetExtensionService()->
IsIncognitoEnabled(extension);
- bool allow_file_access = profile_->GetExtensionService()->
- AllowFileAccess(extension);
for (UserScriptList::iterator iter = lone_scripts_.begin();
iter != lone_scripts_.end(); ++iter) {
if (iter->extension_id() == extension->id()) {
iter->set_incognito_enabled(incognito_enabled);
- iter->set_allow_file_access(allow_file_access);
}
}
StartScan();
« no previous file with comments | « chrome/browser/extensions/extensions_ui.cc ('k') | chrome/browser/ui/webui/options/extension_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698