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

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

Issue 105473003: Add explicit base namespace to string16 users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/manifest_url_handler.h" 5 #include "chrome/common/extensions/manifest_url_handler.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 url_overrides->chrome_url_overrides_ : 109 url_overrides->chrome_url_overrides_ :
110 g_empty_url_overrides.Get(); 110 g_empty_url_overrides.Get();
111 } 111 }
112 112
113 DevToolsPageHandler::DevToolsPageHandler() { 113 DevToolsPageHandler::DevToolsPageHandler() {
114 } 114 }
115 115
116 DevToolsPageHandler::~DevToolsPageHandler() { 116 DevToolsPageHandler::~DevToolsPageHandler() {
117 } 117 }
118 118
119 bool DevToolsPageHandler::Parse(Extension* extension, string16* error) { 119 bool DevToolsPageHandler::Parse(Extension* extension, base::string16* error) {
120 scoped_ptr<ManifestURL> manifest_url(new ManifestURL); 120 scoped_ptr<ManifestURL> manifest_url(new ManifestURL);
121 std::string devtools_str; 121 std::string devtools_str;
122 if (!extension->manifest()->GetString(keys::kDevToolsPage, &devtools_str)) { 122 if (!extension->manifest()->GetString(keys::kDevToolsPage, &devtools_str)) {
123 *error = ASCIIToUTF16(errors::kInvalidDevToolsPage); 123 *error = ASCIIToUTF16(errors::kInvalidDevToolsPage);
124 return false; 124 return false;
125 } 125 }
126 manifest_url->url_ = extension->GetResourceURL(devtools_str); 126 manifest_url->url_ = extension->GetResourceURL(devtools_str);
127 extension->SetManifestData(keys::kDevToolsPage, manifest_url.release()); 127 extension->SetManifestData(keys::kDevToolsPage, manifest_url.release());
128 PermissionsData::GetInitialAPIPermissions(extension)->insert( 128 PermissionsData::GetInitialAPIPermissions(extension)->insert(
129 APIPermission::kDevtools); 129 APIPermission::kDevtools);
130 return true; 130 return true;
131 } 131 }
132 132
133 const std::vector<std::string> DevToolsPageHandler::Keys() const { 133 const std::vector<std::string> DevToolsPageHandler::Keys() const {
134 return SingleKey(keys::kDevToolsPage); 134 return SingleKey(keys::kDevToolsPage);
135 } 135 }
136 136
137 HomepageURLHandler::HomepageURLHandler() { 137 HomepageURLHandler::HomepageURLHandler() {
138 } 138 }
139 139
140 HomepageURLHandler::~HomepageURLHandler() { 140 HomepageURLHandler::~HomepageURLHandler() {
141 } 141 }
142 142
143 bool HomepageURLHandler::Parse(Extension* extension, string16* error) { 143 bool HomepageURLHandler::Parse(Extension* extension, base::string16* error) {
144 scoped_ptr<ManifestURL> manifest_url(new ManifestURL); 144 scoped_ptr<ManifestURL> manifest_url(new ManifestURL);
145 std::string homepage_url_str; 145 std::string homepage_url_str;
146 if (!extension->manifest()->GetString(keys::kHomepageURL, 146 if (!extension->manifest()->GetString(keys::kHomepageURL,
147 &homepage_url_str)) { 147 &homepage_url_str)) {
148 *error = ErrorUtils::FormatErrorMessageUTF16(errors::kInvalidHomepageURL, 148 *error = ErrorUtils::FormatErrorMessageUTF16(errors::kInvalidHomepageURL,
149 std::string()); 149 std::string());
150 return false; 150 return false;
151 } 151 }
152 manifest_url->url_ = GURL(homepage_url_str); 152 manifest_url->url_ = GURL(homepage_url_str);
153 if (!manifest_url->url_.is_valid() || 153 if (!manifest_url->url_.is_valid() ||
154 !manifest_url->url_.SchemeIsHTTPOrHTTPS()) { 154 !manifest_url->url_.SchemeIsHTTPOrHTTPS()) {
155 *error = ErrorUtils::FormatErrorMessageUTF16( 155 *error = ErrorUtils::FormatErrorMessageUTF16(
156 errors::kInvalidHomepageURL, homepage_url_str); 156 errors::kInvalidHomepageURL, homepage_url_str);
157 return false; 157 return false;
158 } 158 }
159 extension->SetManifestData(keys::kHomepageURL, manifest_url.release()); 159 extension->SetManifestData(keys::kHomepageURL, manifest_url.release());
160 return true; 160 return true;
161 } 161 }
162 162
163 const std::vector<std::string> HomepageURLHandler::Keys() const { 163 const std::vector<std::string> HomepageURLHandler::Keys() const {
164 return SingleKey(keys::kHomepageURL); 164 return SingleKey(keys::kHomepageURL);
165 } 165 }
166 166
167 UpdateURLHandler::UpdateURLHandler() { 167 UpdateURLHandler::UpdateURLHandler() {
168 } 168 }
169 169
170 UpdateURLHandler::~UpdateURLHandler() { 170 UpdateURLHandler::~UpdateURLHandler() {
171 } 171 }
172 172
173 bool UpdateURLHandler::Parse(Extension* extension, string16* error) { 173 bool UpdateURLHandler::Parse(Extension* extension, base::string16* error) {
174 scoped_ptr<ManifestURL> manifest_url(new ManifestURL); 174 scoped_ptr<ManifestURL> manifest_url(new ManifestURL);
175 std::string tmp_update_url; 175 std::string tmp_update_url;
176 176
177 if (!extension->manifest()->GetString(keys::kUpdateURL, &tmp_update_url)) { 177 if (!extension->manifest()->GetString(keys::kUpdateURL, &tmp_update_url)) {
178 *error = ErrorUtils::FormatErrorMessageUTF16(errors::kInvalidUpdateURL, 178 *error = ErrorUtils::FormatErrorMessageUTF16(errors::kInvalidUpdateURL,
179 std::string()); 179 std::string());
180 return false; 180 return false;
181 } 181 }
182 182
183 manifest_url->url_ = GURL(tmp_update_url); 183 manifest_url->url_ = GURL(tmp_update_url);
(...skipping 11 matching lines...) Expand all
195 const std::vector<std::string> UpdateURLHandler::Keys() const { 195 const std::vector<std::string> UpdateURLHandler::Keys() const {
196 return SingleKey(keys::kUpdateURL); 196 return SingleKey(keys::kUpdateURL);
197 } 197 }
198 198
199 OptionsPageHandler::OptionsPageHandler() { 199 OptionsPageHandler::OptionsPageHandler() {
200 } 200 }
201 201
202 OptionsPageHandler::~OptionsPageHandler() { 202 OptionsPageHandler::~OptionsPageHandler() {
203 } 203 }
204 204
205 bool OptionsPageHandler::Parse(Extension* extension, string16* error) { 205 bool OptionsPageHandler::Parse(Extension* extension, base::string16* error) {
206 scoped_ptr<ManifestURL> manifest_url(new ManifestURL); 206 scoped_ptr<ManifestURL> manifest_url(new ManifestURL);
207 std::string options_str; 207 std::string options_str;
208 if (!extension->manifest()->GetString(keys::kOptionsPage, &options_str)) { 208 if (!extension->manifest()->GetString(keys::kOptionsPage, &options_str)) {
209 *error = ASCIIToUTF16(errors::kInvalidOptionsPage); 209 *error = ASCIIToUTF16(errors::kInvalidOptionsPage);
210 return false; 210 return false;
211 } 211 }
212 212
213 if (extension->is_hosted_app()) { 213 if (extension->is_hosted_app()) {
214 // hosted apps require an absolute URL. 214 // hosted apps require an absolute URL.
215 GURL options_url(options_str); 215 GURL options_url(options_str);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 const std::vector<std::string> OptionsPageHandler::Keys() const { 262 const std::vector<std::string> OptionsPageHandler::Keys() const {
263 return SingleKey(keys::kOptionsPage); 263 return SingleKey(keys::kOptionsPage);
264 } 264 }
265 265
266 URLOverridesHandler::URLOverridesHandler() { 266 URLOverridesHandler::URLOverridesHandler() {
267 } 267 }
268 268
269 URLOverridesHandler::~URLOverridesHandler() { 269 URLOverridesHandler::~URLOverridesHandler() {
270 } 270 }
271 271
272 bool URLOverridesHandler::Parse(Extension* extension, string16* error) { 272 bool URLOverridesHandler::Parse(Extension* extension, base::string16* error) {
273 const base::DictionaryValue* overrides = NULL; 273 const base::DictionaryValue* overrides = NULL;
274 if (!extension->manifest()->GetDictionary(keys::kChromeURLOverrides, 274 if (!extension->manifest()->GetDictionary(keys::kChromeURLOverrides,
275 &overrides)) { 275 &overrides)) {
276 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides); 276 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
277 return false; 277 return false;
278 } 278 }
279 scoped_ptr<URLOverrides> url_overrides(new URLOverrides); 279 scoped_ptr<URLOverrides> url_overrides(new URLOverrides);
280 // Validate that the overrides are all strings 280 // Validate that the overrides are all strings
281 for (base::DictionaryValue::Iterator iter(*overrides); !iter.IsAtEnd(); 281 for (base::DictionaryValue::Iterator iter(*overrides); !iter.IsAtEnd();
282 iter.Advance()) { 282 iter.Advance()) {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 extension->SetManifestData(keys::kChromeURLOverrides, 329 extension->SetManifestData(keys::kChromeURLOverrides,
330 url_overrides.release()); 330 url_overrides.release());
331 return true; 331 return true;
332 } 332 }
333 333
334 const std::vector<std::string> URLOverridesHandler::Keys() const { 334 const std::vector<std::string> URLOverridesHandler::Keys() const {
335 return SingleKey(keys::kChromeURLOverrides); 335 return SingleKey(keys::kChromeURLOverrides);
336 } 336 }
337 337
338 } // namespace extensions 338 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/manifest_url_handler.h ('k') | chrome/common/extensions/mime_types_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698