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

Side by Side Diff: chrome/common/extensions/csp_handler.cc

Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 7 years, 3 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 unified diff | Download patch
« no previous file with comments | « chrome/common/extensions/command.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/extensions/csp_handler.h" 5 #include "chrome/common/extensions/csp_handler.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/common/extensions/csp_validator.h" 11 #include "chrome/common/extensions/csp_validator.h"
12 #include "chrome/common/extensions/extension_manifest_constants.h"
13 #include "chrome/common/extensions/manifest_handlers/sandboxed_page_info.h" 12 #include "chrome/common/extensions/manifest_handlers/sandboxed_page_info.h"
14 13 #include "extensions/common/manifest_constants.h"
15 namespace keys = extensions::manifest_keys;
16 namespace errors = extension_manifest_errors;
17
18 using extensions::csp_validator::ContentSecurityPolicyIsLegal;
19 using extensions::csp_validator::ContentSecurityPolicyIsSecure;
20 14
21 namespace extensions { 15 namespace extensions {
22 16
17 namespace keys = manifest_keys;
18 namespace errors = manifest_errors;
19
20 using csp_validator::ContentSecurityPolicyIsLegal;
21 using csp_validator::ContentSecurityPolicyIsSecure;
22
23 namespace { 23 namespace {
24 24
25 const char kDefaultContentSecurityPolicy[] = 25 const char kDefaultContentSecurityPolicy[] =
26 "script-src 'self' chrome-extension-resource:; object-src 'self'"; 26 "script-src 'self' chrome-extension-resource:; object-src 'self'";
27 27
28 #define PLATFORM_APP_LOCAL_CSP_SOURCES \ 28 #define PLATFORM_APP_LOCAL_CSP_SOURCES \
29 "'self' data: chrome-extension-resource:" 29 "'self' data: chrome-extension-resource:"
30 const char kDefaultPlatformAppContentSecurityPolicy[] = 30 const char kDefaultPlatformAppContentSecurityPolicy[] =
31 // Platform apps can only use local resources by default. 31 // Platform apps can only use local resources by default.
32 "default-src 'self' chrome-extension-resource:;" 32 "default-src 'self' chrome-extension-resource:;"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 type == Manifest::TYPE_LEGACY_PACKAGED_APP; 124 type == Manifest::TYPE_LEGACY_PACKAGED_APP;
125 } 125 }
126 126
127 const std::vector<std::string> CSPHandler::Keys() const { 127 const std::vector<std::string> CSPHandler::Keys() const {
128 const std::string& key = is_platform_app_ ? 128 const std::string& key = is_platform_app_ ?
129 keys::kPlatformAppContentSecurityPolicy : keys::kContentSecurityPolicy; 129 keys::kPlatformAppContentSecurityPolicy : keys::kContentSecurityPolicy;
130 return SingleKey(key); 130 return SingleKey(key);
131 } 131 }
132 132
133 } // namespace extensions 133 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/command.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698