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

Side by Side Diff: chrome/browser/speech/extension_api/tts_engine_extension_api.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 unified diff | Download patch
OLDNEW
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_engine_extension_api.h" 5 #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8
9 #include <string> 8 #include <string>
9 #include <utility>
10 10
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "chrome/browser/extensions/component_loader.h" 14 #include "chrome/browser/extensions/component_loader.h"
15 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/speech/extension_api/tts_engine_extension_observer.h" 17 #include "chrome/browser/speech/extension_api/tts_engine_extension_observer.h"
18 #include "chrome/browser/speech/extension_api/tts_extension_api.h" 18 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
19 #include "chrome/browser/speech/extension_api/tts_extension_api_constants.h" 19 #include "chrome/browser/speech/extension_api/tts_extension_api_constants.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 options->SetString(constants::kLangKey, voice.lang); 190 options->SetString(constants::kLangKey, voice.lang);
191 191
192 args->Append(options.release()); 192 args->Append(options.release());
193 args->AppendInteger(utterance->id()); 193 args->AppendInteger(utterance->id());
194 194
195 std::string json; 195 std::string json;
196 base::JSONWriter::Write(*args, &json); 196 base::JSONWriter::Write(*args, &json);
197 197
198 scoped_ptr<extensions::Event> event( 198 scoped_ptr<extensions::Event> event(
199 new extensions::Event(extensions::events::TTS_ENGINE_ON_SPEAK, 199 new extensions::Event(extensions::events::TTS_ENGINE_ON_SPEAK,
200 tts_engine_events::kOnSpeak, args.Pass())); 200 tts_engine_events::kOnSpeak, std::move(args)));
201 Profile* profile = Profile::FromBrowserContext(utterance->browser_context()); 201 Profile* profile = Profile::FromBrowserContext(utterance->browser_context());
202 event->restrict_to_browser_context = profile; 202 event->restrict_to_browser_context = profile;
203 EventRouter::Get(profile) 203 EventRouter::Get(profile)
204 ->DispatchEventToExtension(utterance->extension_id(), event.Pass()); 204 ->DispatchEventToExtension(utterance->extension_id(), std::move(event));
205 } 205 }
206 206
207 void TtsExtensionEngine::Stop(Utterance* utterance) { 207 void TtsExtensionEngine::Stop(Utterance* utterance) {
208 scoped_ptr<base::ListValue> args(new base::ListValue()); 208 scoped_ptr<base::ListValue> args(new base::ListValue());
209 scoped_ptr<extensions::Event> event( 209 scoped_ptr<extensions::Event> event(
210 new extensions::Event(extensions::events::TTS_ENGINE_ON_STOP, 210 new extensions::Event(extensions::events::TTS_ENGINE_ON_STOP,
211 tts_engine_events::kOnStop, args.Pass())); 211 tts_engine_events::kOnStop, std::move(args)));
212 Profile* profile = Profile::FromBrowserContext(utterance->browser_context()); 212 Profile* profile = Profile::FromBrowserContext(utterance->browser_context());
213 event->restrict_to_browser_context = profile; 213 event->restrict_to_browser_context = profile;
214 EventRouter::Get(profile) 214 EventRouter::Get(profile)
215 ->DispatchEventToExtension(utterance->extension_id(), event.Pass()); 215 ->DispatchEventToExtension(utterance->extension_id(), std::move(event));
216 } 216 }
217 217
218 void TtsExtensionEngine::Pause(Utterance* utterance) { 218 void TtsExtensionEngine::Pause(Utterance* utterance) {
219 scoped_ptr<base::ListValue> args(new base::ListValue()); 219 scoped_ptr<base::ListValue> args(new base::ListValue());
220 scoped_ptr<extensions::Event> event( 220 scoped_ptr<extensions::Event> event(
221 new extensions::Event(extensions::events::TTS_ENGINE_ON_PAUSE, 221 new extensions::Event(extensions::events::TTS_ENGINE_ON_PAUSE,
222 tts_engine_events::kOnPause, args.Pass())); 222 tts_engine_events::kOnPause, std::move(args)));
223 Profile* profile = Profile::FromBrowserContext(utterance->browser_context()); 223 Profile* profile = Profile::FromBrowserContext(utterance->browser_context());
224 event->restrict_to_browser_context = profile; 224 event->restrict_to_browser_context = profile;
225 EventRouter* event_router = EventRouter::Get(profile); 225 EventRouter* event_router = EventRouter::Get(profile);
226 std::string id = utterance->extension_id(); 226 std::string id = utterance->extension_id();
227 event_router->DispatchEventToExtension(id, event.Pass()); 227 event_router->DispatchEventToExtension(id, std::move(event));
228 WarnIfMissingPauseOrResumeListener(profile, event_router, id); 228 WarnIfMissingPauseOrResumeListener(profile, event_router, id);
229 } 229 }
230 230
231 void TtsExtensionEngine::Resume(Utterance* utterance) { 231 void TtsExtensionEngine::Resume(Utterance* utterance) {
232 scoped_ptr<base::ListValue> args(new base::ListValue()); 232 scoped_ptr<base::ListValue> args(new base::ListValue());
233 scoped_ptr<extensions::Event> event( 233 scoped_ptr<extensions::Event> event(
234 new extensions::Event(extensions::events::TTS_ENGINE_ON_RESUME, 234 new extensions::Event(extensions::events::TTS_ENGINE_ON_RESUME,
235 tts_engine_events::kOnResume, args.Pass())); 235 tts_engine_events::kOnResume, std::move(args)));
236 Profile* profile = Profile::FromBrowserContext(utterance->browser_context()); 236 Profile* profile = Profile::FromBrowserContext(utterance->browser_context());
237 event->restrict_to_browser_context = profile; 237 event->restrict_to_browser_context = profile;
238 EventRouter* event_router = EventRouter::Get(profile); 238 EventRouter* event_router = EventRouter::Get(profile);
239 std::string id = utterance->extension_id(); 239 std::string id = utterance->extension_id();
240 event_router->DispatchEventToExtension(id, event.Pass()); 240 event_router->DispatchEventToExtension(id, std::move(event));
241 WarnIfMissingPauseOrResumeListener(profile, event_router, id); 241 WarnIfMissingPauseOrResumeListener(profile, event_router, id);
242 } 242 }
243 243
244 bool TtsExtensionEngine::LoadBuiltInTtsExtension( 244 bool TtsExtensionEngine::LoadBuiltInTtsExtension(
245 content::BrowserContext* browser_context) { 245 content::BrowserContext* browser_context) {
246 #if defined(OS_CHROMEOS) 246 #if defined(OS_CHROMEOS)
247 Profile* profile = Profile::FromBrowserContext(browser_context); 247 Profile* profile = Profile::FromBrowserContext(browser_context);
248 // Check to see if the engine was previously loaded. 248 // Check to see if the engine was previously loaded.
249 if (TtsEngineExtensionObserver::GetInstance(profile)->SawExtensionLoad( 249 if (TtsEngineExtensionObserver::GetInstance(profile)->SawExtensionLoad(
250 extension_misc::kSpeechSynthesisExtensionId, true)) { 250 extension_misc::kSpeechSynthesisExtensionId, true)) {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 utterance_id, TTS_EVENT_PAUSE, char_index, std::string()); 327 utterance_id, TTS_EVENT_PAUSE, char_index, std::string());
328 } else if (event_type == constants::kEventTypeResume) { 328 } else if (event_type == constants::kEventTypeResume) {
329 controller->OnTtsEvent( 329 controller->OnTtsEvent(
330 utterance_id, TTS_EVENT_RESUME, char_index, std::string()); 330 utterance_id, TTS_EVENT_RESUME, char_index, std::string());
331 } else { 331 } else {
332 EXTENSION_FUNCTION_VALIDATE(false); 332 EXTENSION_FUNCTION_VALIDATE(false);
333 } 333 }
334 334
335 return true; 335 return true;
336 } 336 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698