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

Unified Diff: chrome/common/extensions/api/identity/oauth2_manifest_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 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 side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/api/identity/oauth2_manifest_handler.cc
diff --git a/chrome/common/extensions/api/identity/oauth2_manifest_handler.cc b/chrome/common/extensions/api/identity/oauth2_manifest_handler.cc
index e4af42467a1bde5c99c1f4205324e0aa40b67f8b..0d4f3049adf909aa83b79dc4c658d31acc758a1e 100644
--- a/chrome/common/extensions/api/identity/oauth2_manifest_handler.cc
+++ b/chrome/common/extensions/api/identity/oauth2_manifest_handler.cc
@@ -49,7 +49,7 @@ bool OAuth2ManifestHandler::Parse(Extension* extension,
scoped_ptr<OAuth2Info> info(new OAuth2Info);
const base::DictionaryValue* dict = NULL;
if (!extension->manifest()->GetDictionary(keys::kOAuth2, &dict)) {
- *error = ASCIIToUTF16(errors::kInvalidOAuth2ClientId);
+ *error = base::ASCIIToUTF16(errors::kInvalidOAuth2ClientId);
return false;
}
@@ -59,7 +59,7 @@ bool OAuth2ManifestHandler::Parse(Extension* extension,
// duplicate checking.
if (extension->manifest()->HasPath(keys::kOAuth2AutoApprove) &&
!dict->GetBoolean(kAutoApprove, &info->auto_approve)) {
- *error = ASCIIToUTF16(errors::kInvalidOAuth2AutoApprove);
+ *error = base::ASCIIToUTF16(errors::kInvalidOAuth2AutoApprove);
return false;
}
@@ -68,20 +68,20 @@ bool OAuth2ManifestHandler::Parse(Extension* extension,
if ((!dict->GetString(kClientId, &info->client_id) ||
info->client_id.empty()) &&
(extension->location() != Manifest::COMPONENT || !info->auto_approve)) {
- *error = ASCIIToUTF16(errors::kInvalidOAuth2ClientId);
+ *error = base::ASCIIToUTF16(errors::kInvalidOAuth2ClientId);
return false;
}
const base::ListValue* list = NULL;
if (!dict->GetList(kScopes, &list)) {
- *error = ASCIIToUTF16(errors::kInvalidOAuth2Scopes);
+ *error = base::ASCIIToUTF16(errors::kInvalidOAuth2Scopes);
return false;
}
for (size_t i = 0; i < list->GetSize(); ++i) {
std::string scope;
if (!list->GetString(i, &scope)) {
- *error = ASCIIToUTF16(errors::kInvalidOAuth2Scopes);
+ *error = base::ASCIIToUTF16(errors::kInvalidOAuth2Scopes);
return false;
}
info->scopes.push_back(scope);

Powered by Google App Engine
This is Rietveld 408576698