OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/speech/extension_api/tts_extension_api.h" | 5 #include "chrome/browser/speech/extension_api/tts_extension_api.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
120 details->SetString(constants::kErrorMessageKey, error_message); | 120 details->SetString(constants::kErrorMessageKey, error_message); |
121 } | 121 } |
122 details->SetInteger(constants::kSrcIdKey, utterance->src_id()); | 122 details->SetInteger(constants::kSrcIdKey, utterance->src_id()); |
123 details->SetBoolean(constants::kIsFinalEventKey, utterance->finished()); | 123 details->SetBoolean(constants::kIsFinalEventKey, utterance->finished()); |
124 | 124 |
125 scoped_ptr<base::ListValue> arguments(new base::ListValue()); | 125 scoped_ptr<base::ListValue> arguments(new base::ListValue()); |
126 arguments->Set(0, details.release()); | 126 arguments->Set(0, details.release()); |
127 | 127 |
128 scoped_ptr<extensions::Event> event( | 128 scoped_ptr<extensions::Event> event( |
129 new extensions::Event(events::kOnEvent, arguments.Pass())); | 129 new extensions::Event(events::kOnEvent, arguments.Pass())); |
130 event->restrict_to_browser_context = utterance->profile(); | 130 Profile* profile = Profile::FromBrowserContext(utterance->browser_context()); |
131 event->restrict_to_browser_context = profile; | |
dmazzoni
2014/08/12 06:21:08
You don't need to convert this one either - event-
mrunal
2014/08/12 17:40:58
I agreee.
| |
131 event->event_url = utterance->src_url(); | 132 event->event_url = utterance->src_url(); |
132 extensions::EventRouter::Get(utterance->profile()) | 133 extensions::EventRouter::Get(profile) |
133 ->DispatchEventToExtension(utterance->src_extension_id(), event.Pass()); | 134 ->DispatchEventToExtension(utterance->src_extension_id(), event.Pass()); |
134 | 135 |
135 if (utterance->finished()) | 136 if (utterance->finished()) |
136 delete this; | 137 delete this; |
137 } | 138 } |
138 | 139 |
139 bool TtsSpeakFunction::RunAsync() { | 140 bool TtsSpeakFunction::RunAsync() { |
140 std::string text; | 141 std::string text; |
141 EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &text)); | 142 EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &text)); |
142 if (text.size() > 32768) { | 143 if (text.size() > 32768) { |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
360 } | 361 } |
361 | 362 |
362 static base::LazyInstance<BrowserContextKeyedAPIFactory<TtsAPI> > g_factory = | 363 static base::LazyInstance<BrowserContextKeyedAPIFactory<TtsAPI> > g_factory = |
363 LAZY_INSTANCE_INITIALIZER; | 364 LAZY_INSTANCE_INITIALIZER; |
364 | 365 |
365 BrowserContextKeyedAPIFactory<TtsAPI>* TtsAPI::GetFactoryInstance() { | 366 BrowserContextKeyedAPIFactory<TtsAPI>* TtsAPI::GetFactoryInstance() { |
366 return g_factory.Pointer(); | 367 return g_factory.Pointer(); |
367 } | 368 } |
368 | 369 |
369 } // namespace extensions | 370 } // namespace extensions |
OLD | NEW |