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

Unified Diff: chrome/common/extensions/api/extension_action/action_info.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/extension_action/action_info.cc
diff --git a/chrome/common/extensions/api/extension_action/action_info.cc b/chrome/common/extensions/api/extension_action/action_info.cc
index f2b4540a4f98a65f9381c640ab0dd0323ea23896..c41ae6f5c3990f014e71050041cc8ed6b63bcd9f 100644
--- a/chrome/common/extensions/api/extension_action/action_info.cc
+++ b/chrome/common/extensions/api/extension_action/action_info.cc
@@ -69,7 +69,7 @@ scoped_ptr<ActionInfo> ActionInfo::Load(const Extension* extension,
if (iter == icons->end() ||
!(*iter)->GetAsString(&path) ||
!manifest_handler_helpers::NormalizeAndValidatePath(&path)) {
- *error = ASCIIToUTF16(errors::kInvalidPageActionIconPath);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageActionIconPath);
return scoped_ptr<ActionInfo>();
}
result->default_icon.Add(extension_misc::EXTENSION_ICON_ACTION, path);
@@ -78,7 +78,7 @@ scoped_ptr<ActionInfo> ActionInfo::Load(const Extension* extension,
std::string id;
if (dict->HasKey(keys::kPageActionId)) {
if (!dict->GetString(keys::kPageActionId, &id)) {
- *error = ASCIIToUTF16(errors::kInvalidPageActionId);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageActionId);
return scoped_ptr<ActionInfo>();
}
result->id = id;
@@ -106,7 +106,7 @@ scoped_ptr<ActionInfo> ActionInfo::Load(const Extension* extension,
result->default_icon.Add(extension_misc::EXTENSION_ICON_ACTION,
default_icon);
} else {
- *error = ASCIIToUTF16(errors::kInvalidPageActionIconPath);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageActionIconPath);
return scoped_ptr<ActionInfo>();
}
}
@@ -116,12 +116,12 @@ scoped_ptr<ActionInfo> ActionInfo::Load(const Extension* extension,
if (dict->HasKey(keys::kPageActionDefaultTitle)) {
if (!dict->GetString(keys::kPageActionDefaultTitle,
&result->default_title)) {
- *error = ASCIIToUTF16(errors::kInvalidPageActionDefaultTitle);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageActionDefaultTitle);
return scoped_ptr<ActionInfo>();
}
} else if (extension->manifest_version() == 1 && dict->HasKey(keys::kName)) {
if (!dict->GetString(keys::kName, &result->default_title)) {
- *error = ASCIIToUTF16(errors::kInvalidPageActionName);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageActionName);
return scoped_ptr<ActionInfo>();
}
}
@@ -157,7 +157,7 @@ scoped_ptr<ActionInfo> ActionInfo::Load(const Extension* extension,
return scoped_ptr<ActionInfo>();
}
} else {
- *error = ASCIIToUTF16(errors::kInvalidPageActionPopup);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageActionPopup);
return scoped_ptr<ActionInfo>();
}

Powered by Google App Engine
This is Rietveld 408576698