| 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/web_accessible_resources_handler.h" | 5 #include "chrome/common/extensions/web_accessible_resources_handler.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 #include "chrome/common/extensions/extension_manifest_constants.h" | 11 #include "chrome/common/extensions/extension_manifest_constants.h" |
| 12 #include "chrome/common/extensions/manifest.h" |
| 12 #include "extensions/common/error_utils.h" | 13 #include "extensions/common/error_utils.h" |
| 13 | 14 |
| 14 namespace extensions { | 15 namespace extensions { |
| 15 | 16 |
| 16 namespace keys = extension_manifest_keys; | 17 namespace keys = extension_manifest_keys; |
| 17 namespace errors = extension_manifest_errors; | 18 namespace errors = extension_manifest_errors; |
| 18 | 19 |
| 19 namespace { | 20 namespace { |
| 20 | 21 |
| 21 const WebAccessibleResourcesInfo* GetResourcesInfo(const Extension* extension) { | 22 const WebAccessibleResourcesInfo* GetResourcesInfo(const Extension* extension) { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 const WebAccessibleResourcesInfo* info = GetResourcesInfo(extension); | 54 const WebAccessibleResourcesInfo* info = GetResourcesInfo(extension); |
| 54 return info && info->web_accessible_resources_.size() > 0; | 55 return info && info->web_accessible_resources_.size() > 0; |
| 55 } | 56 } |
| 56 | 57 |
| 57 WebAccessibleResourcesHandler::WebAccessibleResourcesHandler() { | 58 WebAccessibleResourcesHandler::WebAccessibleResourcesHandler() { |
| 58 } | 59 } |
| 59 | 60 |
| 60 WebAccessibleResourcesHandler::~WebAccessibleResourcesHandler() { | 61 WebAccessibleResourcesHandler::~WebAccessibleResourcesHandler() { |
| 61 } | 62 } |
| 62 | 63 |
| 63 bool WebAccessibleResourcesHandler::Parse(const base::Value* value, | 64 bool WebAccessibleResourcesHandler::Parse(Extension* extension, |
| 64 Extension* extension, | |
| 65 string16* error) { | 65 string16* error) { |
| 66 scoped_ptr<WebAccessibleResourcesInfo> info(new WebAccessibleResourcesInfo); | 66 scoped_ptr<WebAccessibleResourcesInfo> info(new WebAccessibleResourcesInfo); |
| 67 const ListValue* list_value = NULL; | 67 const ListValue* list_value = NULL; |
| 68 if (!value->GetAsList(&list_value)) { | 68 if (!extension->manifest()->GetList(keys::kWebAccessibleResources, |
| 69 &list_value)) { |
| 69 *error = ASCIIToUTF16(errors::kInvalidWebAccessibleResourcesList); | 70 *error = ASCIIToUTF16(errors::kInvalidWebAccessibleResourcesList); |
| 70 return false; | 71 return false; |
| 71 } | 72 } |
| 72 for (size_t i = 0; i < list_value->GetSize(); ++i) { | 73 for (size_t i = 0; i < list_value->GetSize(); ++i) { |
| 73 std::string relative_path; | 74 std::string relative_path; |
| 74 if (!list_value->GetString(i, &relative_path)) { | 75 if (!list_value->GetString(i, &relative_path)) { |
| 75 *error = ErrorUtils::FormatErrorMessageUTF16( | 76 *error = ErrorUtils::FormatErrorMessageUTF16( |
| 76 errors::kInvalidWebAccessibleResource, base::IntToString(i)); | 77 errors::kInvalidWebAccessibleResource, base::IntToString(i)); |
| 77 return false; | 78 return false; |
| 78 } | 79 } |
| 79 URLPattern pattern(URLPattern::SCHEME_EXTENSION); | 80 URLPattern pattern(URLPattern::SCHEME_EXTENSION); |
| 80 if (pattern.Parse(extension->url().spec()) != URLPattern::PARSE_SUCCESS) { | 81 if (pattern.Parse(extension->url().spec()) != URLPattern::PARSE_SUCCESS) { |
| 81 *error = ErrorUtils::FormatErrorMessageUTF16( | 82 *error = ErrorUtils::FormatErrorMessageUTF16( |
| 82 errors::kInvalidURLPatternError, extension->url().spec()); | 83 errors::kInvalidURLPatternError, extension->url().spec()); |
| 83 return false; | 84 return false; |
| 84 } | 85 } |
| 85 while (relative_path[0] == '/') | 86 while (relative_path[0] == '/') |
| 86 relative_path = relative_path.substr(1, relative_path.length() - 1); | 87 relative_path = relative_path.substr(1, relative_path.length() - 1); |
| 87 pattern.SetPath(pattern.path() + relative_path); | 88 pattern.SetPath(pattern.path() + relative_path); |
| 88 info->web_accessible_resources_.AddPattern(pattern); | 89 info->web_accessible_resources_.AddPattern(pattern); |
| 89 } | 90 } |
| 90 extension->SetManifestData(keys::kWebAccessibleResources, info.release()); | 91 extension->SetManifestData(keys::kWebAccessibleResources, info.release()); |
| 91 return true; | 92 return true; |
| 92 } | 93 } |
| 93 | 94 |
| 94 } // namespace extensions | 95 } // namespace extensions |
| OLD | NEW |