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

Unified Diff: chrome/common/extensions/api/extension_action/page_action_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/extension_action/page_action_handler.cc
diff --git a/chrome/common/extensions/api/extension_action/page_action_handler.cc b/chrome/common/extensions/api/extension_action/page_action_handler.cc
index 7f87e6c0c5759e5f2ddd31735def00a47016858b..a9d2ea8aa5389c78164e7961c474ea9dd2b69800 100644
--- a/chrome/common/extensions/api/extension_action/page_action_handler.cc
+++ b/chrome/common/extensions/api/extension_action/page_action_handler.cc
@@ -30,7 +30,7 @@ bool PageActionHandler::Parse(Extension* extension, base::string16* error) {
if (extension->manifest()->HasKey(keys::kPageActions)) {
const base::ListValue* list_value = NULL;
if (!extension->manifest()->GetList(keys::kPageActions, &list_value)) {
- *error = ASCIIToUTF16(errors::kInvalidPageActionsList);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageActionsList);
return false;
}
@@ -41,24 +41,24 @@ bool PageActionHandler::Parse(Extension* extension, base::string16* error) {
// a page_actions key in the manifest. Don't set |page_action_value|.
} else if (list_value_length == 1u) {
if (!list_value->GetDictionary(0, &page_action_value)) {
- *error = ASCIIToUTF16(errors::kInvalidPageAction);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageAction);
return false;
}
} else { // list_value_length > 1u.
- *error = ASCIIToUTF16(errors::kInvalidPageActionsListSize);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageActionsListSize);
return false;
}
} else if (extension->manifest()->HasKey(keys::kPageAction)) {
if (!extension->manifest()->GetDictionary(keys::kPageAction,
&page_action_value)) {
- *error = ASCIIToUTF16(errors::kInvalidPageAction);
+ *error = base::ASCIIToUTF16(errors::kInvalidPageAction);
return false;
}
}
// An extension cannot have both browser and page actions.
if (extension->manifest()->HasKey(keys::kBrowserAction)) {
- *error = ASCIIToUTF16(errors::kOneUISurfaceOnly);
+ *error = base::ASCIIToUTF16(errors::kOneUISurfaceOnly);
return false;
}

Powered by Google App Engine
This is Rietveld 408576698