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

Unified Diff: chrome/common/extensions/api/speech/tts_engine_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/speech/tts_engine_manifest_handler.cc
diff --git a/chrome/common/extensions/api/speech/tts_engine_manifest_handler.cc b/chrome/common/extensions/api/speech/tts_engine_manifest_handler.cc
index 0dd93fba0dadf9a7e00a4160ce1251652042bc52..9919962e6f88da11643ec0044c9ef285b7773d98 100644
--- a/chrome/common/extensions/api/speech/tts_engine_manifest_handler.cc
+++ b/chrome/common/extensions/api/speech/tts_engine_manifest_handler.cc
@@ -52,7 +52,7 @@ bool TtsEngineManifestHandler::Parse(Extension* extension,
scoped_ptr<TtsVoices> info(new TtsVoices);
const base::DictionaryValue* tts_dict = NULL;
if (!extension->manifest()->GetDictionary(keys::kTtsEngine, &tts_dict)) {
- *error = ASCIIToUTF16(errors::kInvalidTts);
+ *error = base::ASCIIToUTF16(errors::kInvalidTts);
return false;
}
@@ -61,14 +61,14 @@ bool TtsEngineManifestHandler::Parse(Extension* extension,
const base::ListValue* tts_voices = NULL;
if (!tts_dict->GetList(keys::kTtsVoices, &tts_voices)) {
- *error = ASCIIToUTF16(errors::kInvalidTtsVoices);
+ *error = base::ASCIIToUTF16(errors::kInvalidTtsVoices);
return false;
}
for (size_t i = 0; i < tts_voices->GetSize(); i++) {
const base::DictionaryValue* one_tts_voice = NULL;
if (!tts_voices->GetDictionary(i, &one_tts_voice)) {
- *error = ASCIIToUTF16(errors::kInvalidTtsVoices);
+ *error = base::ASCIIToUTF16(errors::kInvalidTtsVoices);
return false;
}
@@ -76,7 +76,7 @@ bool TtsEngineManifestHandler::Parse(Extension* extension,
if (one_tts_voice->HasKey(keys::kTtsVoicesVoiceName)) {
if (!one_tts_voice->GetString(
keys::kTtsVoicesVoiceName, &voice_data.voice_name)) {
- *error = ASCIIToUTF16(errors::kInvalidTtsVoicesVoiceName);
+ *error = base::ASCIIToUTF16(errors::kInvalidTtsVoicesVoiceName);
return false;
}
}
@@ -84,7 +84,7 @@ bool TtsEngineManifestHandler::Parse(Extension* extension,
if (!one_tts_voice->GetString(
keys::kTtsVoicesLang, &voice_data.lang) ||
!l10n_util::IsValidLocaleSyntax(voice_data.lang)) {
- *error = ASCIIToUTF16(errors::kInvalidTtsVoicesLang);
+ *error = base::ASCIIToUTF16(errors::kInvalidTtsVoicesLang);
return false;
}
}
@@ -93,14 +93,14 @@ bool TtsEngineManifestHandler::Parse(Extension* extension,
keys::kTtsVoicesGender, &voice_data.gender) ||
(voice_data.gender != keys::kTtsGenderMale &&
voice_data.gender != keys::kTtsGenderFemale)) {
- *error = ASCIIToUTF16(errors::kInvalidTtsVoicesGender);
+ *error = base::ASCIIToUTF16(errors::kInvalidTtsVoicesGender);
return false;
}
}
if (one_tts_voice->HasKey(keys::kTtsVoicesRemote)) {
if (!one_tts_voice->GetBoolean(
keys::kTtsVoicesRemote, &voice_data.remote)) {
- *error = ASCIIToUTF16(errors::kInvalidTtsVoicesRemote);
+ *error = base::ASCIIToUTF16(errors::kInvalidTtsVoicesRemote);
return false;
}
}
@@ -109,14 +109,14 @@ bool TtsEngineManifestHandler::Parse(Extension* extension,
if (!one_tts_voice->GetList(
keys::kTtsVoicesEventTypes,
&event_types_list)) {
- *error = ASCIIToUTF16(
+ *error = base::ASCIIToUTF16(
errors::kInvalidTtsVoicesEventTypes);
return false;
}
for (size_t i = 0; i < event_types_list->GetSize(); i++) {
std::string event_type;
if (!event_types_list->GetString(i, &event_type)) {
- *error = ASCIIToUTF16(errors::kInvalidTtsVoicesEventTypes);
+ *error = base::ASCIIToUTF16(errors::kInvalidTtsVoicesEventTypes);
return false;
}
if (event_type != keys::kTtsVoicesEventTypeEnd &&
@@ -125,12 +125,12 @@ bool TtsEngineManifestHandler::Parse(Extension* extension,
event_type != keys::kTtsVoicesEventTypeSentence &&
event_type != keys::kTtsVoicesEventTypeStart &&
event_type != keys::kTtsVoicesEventTypeWord) {
- *error = ASCIIToUTF16(errors::kInvalidTtsVoicesEventTypes);
+ *error = base::ASCIIToUTF16(errors::kInvalidTtsVoicesEventTypes);
return false;
}
if (voice_data.event_types.find(event_type) !=
voice_data.event_types.end()) {
- *error = ASCIIToUTF16(errors::kInvalidTtsVoicesEventTypes);
+ *error = base::ASCIIToUTF16(errors::kInvalidTtsVoicesEventTypes);
return false;
}
voice_data.event_types.insert(event_type);

Powered by Google App Engine
This is Rietveld 408576698