Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: chrome/common/extensions/web_accessible_resources_handler.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 WebAccessibleResourcesHandler::~WebAccessibleResourcesHandler() { 61 WebAccessibleResourcesHandler::~WebAccessibleResourcesHandler() {
62 } 62 }
63 63
64 bool WebAccessibleResourcesHandler::Parse(Extension* extension, 64 bool WebAccessibleResourcesHandler::Parse(Extension* extension,
65 base::string16* error) { 65 base::string16* error) {
66 scoped_ptr<WebAccessibleResourcesInfo> info(new WebAccessibleResourcesInfo); 66 scoped_ptr<WebAccessibleResourcesInfo> info(new WebAccessibleResourcesInfo);
67 const base::ListValue* list_value = NULL; 67 const base::ListValue* list_value = NULL;
68 if (!extension->manifest()->GetList(keys::kWebAccessibleResources, 68 if (!extension->manifest()->GetList(keys::kWebAccessibleResources,
69 &list_value)) { 69 &list_value)) {
70 *error = ASCIIToUTF16(errors::kInvalidWebAccessibleResourcesList); 70 *error = base::ASCIIToUTF16(errors::kInvalidWebAccessibleResourcesList);
71 return false; 71 return false;
72 } 72 }
73 for (size_t i = 0; i < list_value->GetSize(); ++i) { 73 for (size_t i = 0; i < list_value->GetSize(); ++i) {
74 std::string relative_path; 74 std::string relative_path;
75 if (!list_value->GetString(i, &relative_path)) { 75 if (!list_value->GetString(i, &relative_path)) {
76 *error = ErrorUtils::FormatErrorMessageUTF16( 76 *error = ErrorUtils::FormatErrorMessageUTF16(
77 errors::kInvalidWebAccessibleResource, base::IntToString(i)); 77 errors::kInvalidWebAccessibleResource, base::IntToString(i));
78 return false; 78 return false;
79 } 79 }
80 URLPattern pattern(URLPattern::SCHEME_EXTENSION); 80 URLPattern pattern(URLPattern::SCHEME_EXTENSION);
81 if (pattern.Parse(extension->url().spec()) != URLPattern::PARSE_SUCCESS) { 81 if (pattern.Parse(extension->url().spec()) != URLPattern::PARSE_SUCCESS) {
82 *error = ErrorUtils::FormatErrorMessageUTF16( 82 *error = ErrorUtils::FormatErrorMessageUTF16(
83 errors::kInvalidURLPatternError, extension->url().spec()); 83 errors::kInvalidURLPatternError, extension->url().spec());
84 return false; 84 return false;
85 } 85 }
86 while (relative_path[0] == '/') 86 while (relative_path[0] == '/')
87 relative_path = relative_path.substr(1, relative_path.length() - 1); 87 relative_path = relative_path.substr(1, relative_path.length() - 1);
88 pattern.SetPath(pattern.path() + relative_path); 88 pattern.SetPath(pattern.path() + relative_path);
89 info->web_accessible_resources_.AddPattern(pattern); 89 info->web_accessible_resources_.AddPattern(pattern);
90 } 90 }
91 extension->SetManifestData(keys::kWebAccessibleResources, info.release()); 91 extension->SetManifestData(keys::kWebAccessibleResources, info.release());
92 return true; 92 return true;
93 } 93 }
94 94
95 const std::vector<std::string> WebAccessibleResourcesHandler::Keys() const { 95 const std::vector<std::string> WebAccessibleResourcesHandler::Keys() const {
96 return SingleKey(keys::kWebAccessibleResources); 96 return SingleKey(keys::kWebAccessibleResources);
97 } 97 }
98 98
99 } // namespace extensions 99 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/permissions/usb_device_permission_unittest.cc ('k') | chrome/common/extensions/webview_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698