| OLD | NEW |
| 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 "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" |
| 11 #include "chrome/common/extensions/csp_validator.h" | 11 #include "extensions/common/csp_validator.h" |
| 12 #include "chrome/common/extensions/manifest_handlers/sandboxed_page_info.h" | |
| 13 #include "extensions/common/manifest_constants.h" | 12 #include "extensions/common/manifest_constants.h" |
| 13 #include "extensions/common/manifest_handlers/sandboxed_page_info.h" |
| 14 | 14 |
| 15 namespace extensions { | 15 namespace extensions { |
| 16 | 16 |
| 17 namespace keys = manifest_keys; | 17 namespace keys = manifest_keys; |
| 18 namespace errors = manifest_errors; | 18 namespace errors = manifest_errors; |
| 19 | 19 |
| 20 using csp_validator::ContentSecurityPolicyIsLegal; | 20 using csp_validator::ContentSecurityPolicyIsLegal; |
| 21 using csp_validator::ContentSecurityPolicyIsSecure; | 21 using csp_validator::ContentSecurityPolicyIsSecure; |
| 22 | 22 |
| 23 namespace { | 23 namespace { |
| (...skipping 100 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 |