OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "extensions/common/manifest_handlers/csp_info.h" | 5 #include "extensions/common/manifest_handlers/csp_info.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" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 GetContentSecurityPolicy(extension); | 70 GetContentSecurityPolicy(extension); |
71 } | 71 } |
72 | 72 |
73 CSPHandler::CSPHandler(bool is_platform_app) | 73 CSPHandler::CSPHandler(bool is_platform_app) |
74 : is_platform_app_(is_platform_app) { | 74 : is_platform_app_(is_platform_app) { |
75 } | 75 } |
76 | 76 |
77 CSPHandler::~CSPHandler() { | 77 CSPHandler::~CSPHandler() { |
78 } | 78 } |
79 | 79 |
80 bool CSPHandler::Parse(Extension* extension, string16* error) { | 80 bool CSPHandler::Parse(Extension* extension, base::string16* error) { |
81 const std::string key = Keys()[0]; | 81 const std::string key = Keys()[0]; |
82 if (!extension->manifest()->HasPath(key)) { | 82 if (!extension->manifest()->HasPath(key)) { |
83 if (extension->manifest_version() >= 2) { | 83 if (extension->manifest_version() >= 2) { |
84 // TODO(abarth): Should we continue to let extensions override the | 84 // TODO(abarth): Should we continue to let extensions override the |
85 // default Content-Security-Policy? | 85 // default Content-Security-Policy? |
86 std::string content_security_policy = is_platform_app_ ? | 86 std::string content_security_policy = is_platform_app_ ? |
87 kDefaultPlatformAppContentSecurityPolicy : | 87 kDefaultPlatformAppContentSecurityPolicy : |
88 kDefaultContentSecurityPolicy; | 88 kDefaultContentSecurityPolicy; |
89 | 89 |
90 CHECK(ContentSecurityPolicyIsSecure(content_security_policy, | 90 CHECK(ContentSecurityPolicyIsSecure(content_security_policy, |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 |
OLD | NEW |