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

Unified Diff: chrome/browser/speech/extension_api/tts_engine_extension_api.cc

Issue 2236703002: [Extensions] Convert some SyncExtensionFunctions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nulltpr Created 4 years, 4 months 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/browser/speech/extension_api/tts_engine_extension_api.cc
diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
index dd718c382b66c9e2259c09ab7b7f05e8dad4429a..6811ef067789eee786e883ad6ad4d24bb93a8b18 100644
--- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
+++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
@@ -263,11 +263,12 @@ bool TtsExtensionEngine::LoadBuiltInTtsExtension(
#endif
}
-bool ExtensionTtsEngineSendTtsEventFunction::RunSync() {
- int utterance_id;
+ExtensionFunction::ResponseAction
+ExtensionTtsEngineSendTtsEventFunction::Run() {
+ int utterance_id = 0;
EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &utterance_id));
- base::DictionaryValue* event;
+ base::DictionaryValue* event = nullptr;
EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &event));
std::string event_type;
@@ -284,10 +285,8 @@ bool ExtensionTtsEngineSendTtsEventFunction::RunSync() {
bool event_type_allowed = false;
const std::vector<extensions::TtsVoice>* tts_voices =
extensions::TtsVoice::GetTtsVoices(extension());
- if (!tts_voices) {
- error_ = constants::kErrorUndeclaredEventType;
- return false;
- }
+ if (!tts_voices)
+ return RespondNow(Error(constants::kErrorUndeclaredEventType));
for (size_t i = 0; i < tts_voices->size(); i++) {
const extensions::TtsVoice& voice = tts_voices->at(i);
@@ -296,10 +295,8 @@ bool ExtensionTtsEngineSendTtsEventFunction::RunSync() {
break;
}
}
- if (!event_type_allowed) {
- error_ = constants::kErrorUndeclaredEventType;
- return false;
- }
+ if (!event_type_allowed)
+ return RespondNow(Error(constants::kErrorUndeclaredEventType));
TtsController* controller = TtsController::GetInstance();
if (event_type == constants::kEventTypeStart) {
@@ -332,5 +329,5 @@ bool ExtensionTtsEngineSendTtsEventFunction::RunSync() {
EXTENSION_FUNCTION_VALIDATE(false);
}
- return true;
+ return RespondNow(NoArguments());
}

Powered by Google App Engine
This is Rietveld 408576698