| Index: chrome/common/extensions/web_accessible_resources_handler.cc
|
| diff --git a/chrome/common/extensions/web_accessible_resources_handler.cc b/chrome/common/extensions/web_accessible_resources_handler.cc
|
| index 7b135d98f114c562c379ac1d75ee190d0c19787f..f6e171014a42510a46dca6e862b552aad4bf01cc 100644
|
| --- a/chrome/common/extensions/web_accessible_resources_handler.cc
|
| +++ b/chrome/common/extensions/web_accessible_resources_handler.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "base/values.h"
|
| #include "chrome/common/extensions/extension_manifest_constants.h"
|
| +#include "chrome/common/extensions/manifest.h"
|
| #include "extensions/common/error_utils.h"
|
|
|
| namespace extensions {
|
| @@ -60,12 +61,12 @@ WebAccessibleResourcesHandler::WebAccessibleResourcesHandler() {
|
| WebAccessibleResourcesHandler::~WebAccessibleResourcesHandler() {
|
| }
|
|
|
| -bool WebAccessibleResourcesHandler::Parse(const base::Value* value,
|
| - Extension* extension,
|
| +bool WebAccessibleResourcesHandler::Parse(Extension* extension,
|
| string16* error) {
|
| scoped_ptr<WebAccessibleResourcesInfo> info(new WebAccessibleResourcesInfo);
|
| const ListValue* list_value = NULL;
|
| - if (!value->GetAsList(&list_value)) {
|
| + if (!extension->manifest()->GetList(keys::kWebAccessibleResources,
|
| + &list_value)) {
|
| *error = ASCIIToUTF16(errors::kInvalidWebAccessibleResourcesList);
|
| return false;
|
| }
|
|
|