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

Unified Diff: chrome/common/extensions/extension.cc

Issue 10750010: Add an installType property to the management API (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Forgot to remove param from LoadExtensionWithOptions (sorry) Created 8 years, 5 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 | « chrome/common/extensions/api/management.json ('k') | chrome/common/extensions/extension_file_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 2427b8d532de81c1c3a7716c883a0ca49abbae88..d422396560b8c961661267182711df4b309f05b2 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -658,9 +658,10 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
if (pattern.MatchesScheme(chrome::kFileScheme) &&
!CanExecuteScriptEverywhere()) {
wants_file_access_ = true;
- if (!(creation_flags_ & ALLOW_FILE_ACCESS))
+ if (!(creation_flags_ & ALLOW_FILE_ACCESS)) {
pattern.SetValidSchemes(
pattern.valid_schemes() & ~URLPattern::SCHEME_FILE);
+ }
}
result->add_url_pattern(pattern);
@@ -3418,9 +3419,10 @@ bool Extension::ParsePermissions(const char* key,
if (pattern.MatchesScheme(chrome::kFileScheme) &&
!CanExecuteScriptEverywhere()) {
wants_file_access_ = true;
- if (!(creation_flags_ & ALLOW_FILE_ACCESS))
+ if (!(creation_flags_ & ALLOW_FILE_ACCESS)) {
pattern.SetValidSchemes(
pattern.valid_schemes() & ~URLPattern::SCHEME_FILE);
+ }
}
host_permissions->AddPattern(pattern);
« no previous file with comments | « chrome/common/extensions/api/management.json ('k') | chrome/common/extensions/extension_file_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698