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

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

Issue 11440004: Remove deprecated extension EventRouter APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile Created 8 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/browser/speech/extension_api/tts_extension_api_controller.cc
diff --git a/chrome/browser/speech/extension_api/tts_extension_api_controller.cc b/chrome/browser/speech/extension_api/tts_extension_api_controller.cc
index 10ab0aa8aac71d9cb430f5638dc28c009f569823..7799790cf33c6f281fca6afc5681a75da118570d 100644
--- a/chrome/browser/speech/extension_api/tts_extension_api_controller.cc
+++ b/chrome/browser/speech/extension_api/tts_extension_api_controller.cc
@@ -109,22 +109,25 @@ void Utterance::OnTtsEvent(TtsEventType event_type,
if (src_id_ < 0)
return;
- DictionaryValue* event = new DictionaryValue();
+ DictionaryValue* details = new DictionaryValue();
if (char_index != kInvalidCharIndex)
- event->SetInteger(constants::kCharIndexKey, char_index);
- event->SetString(constants::kEventTypeKey, event_type_string);
+ details->SetInteger(constants::kCharIndexKey, char_index);
+ details->SetString(constants::kEventTypeKey, event_type_string);
if (event_type == TTS_EVENT_ERROR) {
- event->SetString(constants::kErrorMessageKey, error_message);
+ details->SetString(constants::kErrorMessageKey, error_message);
}
- event->SetInteger(constants::kSrcIdKey, src_id_);
- event->SetBoolean(constants::kIsFinalEventKey, finished_);
+ details->SetInteger(constants::kSrcIdKey, src_id_);
+ details->SetBoolean(constants::kIsFinalEventKey, finished_);
scoped_ptr<ListValue> arguments(new ListValue());
- arguments->Set(0, event);
+ arguments->Set(0, details);
+ scoped_ptr<extensions::Event> event(new extensions::Event(
+ events::kOnEvent, arguments.Pass()));
+ event->restrict_to_profile = profile_;
+ event->event_url = src_url_;
extensions::ExtensionSystem::Get(profile_)->event_router()->
- DispatchEventToExtension(src_extension_id_, events::kOnEvent,
- arguments.Pass(), profile_, src_url_);
+ DispatchEventToExtension(src_extension_id_, event.Pass());
}
void Utterance::Finish() {

Powered by Google App Engine
This is Rietveld 408576698