| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/web_accessible_resources_info.h" | 5 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include <memory> |
| 10 |
| 10 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 12 #include "base/values.h" | 13 #include "base/values.h" |
| 13 #include "extensions/common/error_utils.h" | 14 #include "extensions/common/error_utils.h" |
| 14 #include "extensions/common/manifest.h" | 15 #include "extensions/common/manifest.h" |
| 15 #include "extensions/common/manifest_constants.h" | 16 #include "extensions/common/manifest_constants.h" |
| 16 | 17 |
| 17 namespace extensions { | 18 namespace extensions { |
| 18 | 19 |
| 19 namespace keys = manifest_keys; | 20 namespace keys = manifest_keys; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 } | 59 } |
| 59 | 60 |
| 60 WebAccessibleResourcesHandler::WebAccessibleResourcesHandler() { | 61 WebAccessibleResourcesHandler::WebAccessibleResourcesHandler() { |
| 61 } | 62 } |
| 62 | 63 |
| 63 WebAccessibleResourcesHandler::~WebAccessibleResourcesHandler() { | 64 WebAccessibleResourcesHandler::~WebAccessibleResourcesHandler() { |
| 64 } | 65 } |
| 65 | 66 |
| 66 bool WebAccessibleResourcesHandler::Parse(Extension* extension, | 67 bool WebAccessibleResourcesHandler::Parse(Extension* extension, |
| 67 base::string16* error) { | 68 base::string16* error) { |
| 68 scoped_ptr<WebAccessibleResourcesInfo> info(new WebAccessibleResourcesInfo); | 69 std::unique_ptr<WebAccessibleResourcesInfo> info( |
| 70 new WebAccessibleResourcesInfo); |
| 69 const base::ListValue* list_value = NULL; | 71 const base::ListValue* list_value = NULL; |
| 70 if (!extension->manifest()->GetList(keys::kWebAccessibleResources, | 72 if (!extension->manifest()->GetList(keys::kWebAccessibleResources, |
| 71 &list_value)) { | 73 &list_value)) { |
| 72 *error = base::ASCIIToUTF16(errors::kInvalidWebAccessibleResourcesList); | 74 *error = base::ASCIIToUTF16(errors::kInvalidWebAccessibleResourcesList); |
| 73 return false; | 75 return false; |
| 74 } | 76 } |
| 75 for (size_t i = 0; i < list_value->GetSize(); ++i) { | 77 for (size_t i = 0; i < list_value->GetSize(); ++i) { |
| 76 std::string relative_path; | 78 std::string relative_path; |
| 77 if (!list_value->GetString(i, &relative_path)) { | 79 if (!list_value->GetString(i, &relative_path)) { |
| 78 *error = ErrorUtils::FormatErrorMessageUTF16( | 80 *error = ErrorUtils::FormatErrorMessageUTF16( |
| (...skipping 13 matching lines...) Expand all Loading... |
| 92 } | 94 } |
| 93 extension->SetManifestData(keys::kWebAccessibleResources, info.release()); | 95 extension->SetManifestData(keys::kWebAccessibleResources, info.release()); |
| 94 return true; | 96 return true; |
| 95 } | 97 } |
| 96 | 98 |
| 97 const std::vector<std::string> WebAccessibleResourcesHandler::Keys() const { | 99 const std::vector<std::string> WebAccessibleResourcesHandler::Keys() const { |
| 98 return SingleKey(keys::kWebAccessibleResources); | 100 return SingleKey(keys::kWebAccessibleResources); |
| 99 } | 101 } |
| 100 | 102 |
| 101 } // namespace extensions | 103 } // namespace extensions |
| OLD | NEW |