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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 15907012: Implement SpeechRecognizerImplAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 7 years, 6 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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/hi_res_timer_manager.h" 10 #include "base/hi_res_timer_manager.h"
(...skipping 15 matching lines...) Expand all
26 #include "content/browser/gpu/gpu_process_host.h" 26 #include "content/browser/gpu/gpu_process_host.h"
27 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 27 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
28 #include "content/browser/histogram_synchronizer.h" 28 #include "content/browser/histogram_synchronizer.h"
29 #include "content/browser/in_process_webkit/webkit_thread.h" 29 #include "content/browser/in_process_webkit/webkit_thread.h"
30 #include "content/browser/loader/resource_dispatcher_host_impl.h" 30 #include "content/browser/loader/resource_dispatcher_host_impl.h"
31 #include "content/browser/net/browser_online_state_observer.h" 31 #include "content/browser/net/browser_online_state_observer.h"
32 #include "content/browser/plugin_service_impl.h" 32 #include "content/browser/plugin_service_impl.h"
33 #include "content/browser/renderer_host/media/audio_mirroring_manager.h" 33 #include "content/browser/renderer_host/media/audio_mirroring_manager.h"
34 #include "content/browser/renderer_host/media/media_stream_manager.h" 34 #include "content/browser/renderer_host/media/media_stream_manager.h"
35 #include "content/browser/speech/speech_recognition_manager_impl.h" 35 #include "content/browser/speech/speech_recognition_manager_impl.h"
36 #include "content/browser/speech/speech_recognizer_impl_android.h"
36 #include "content/browser/tracing/trace_controller_impl.h" 37 #include "content/browser/tracing/trace_controller_impl.h"
37 #include "content/browser/webui/content_web_ui_controller_factory.h" 38 #include "content/browser/webui/content_web_ui_controller_factory.h"
38 #include "content/browser/webui/url_data_manager.h" 39 #include "content/browser/webui/url_data_manager.h"
39 #include "content/public/browser/browser_main_parts.h" 40 #include "content/public/browser/browser_main_parts.h"
40 #include "content/public/browser/browser_shutdown.h" 41 #include "content/public/browser/browser_shutdown.h"
41 #include "content/public/browser/compositor_util.h" 42 #include "content/public/browser/compositor_util.h"
42 #include "content/public/browser/content_browser_client.h" 43 #include "content/public/browser/content_browser_client.h"
43 #include "content/public/browser/render_process_host.h" 44 #include "content/public/browser/render_process_host.h"
44 #include "content/public/common/content_switches.h" 45 #include "content/public/common/content_switches.h"
45 #include "content/public/common/main_function_params.h" 46 #include "content/public/common/main_function_params.h"
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 455
455 #if defined(OS_ANDROID) 456 #if defined(OS_ANDROID)
456 { 457 {
457 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTexturePeer") 458 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTexturePeer")
458 SurfaceTexturePeer::InitInstance(new SurfaceTexturePeerBrowserImpl()); 459 SurfaceTexturePeer::InitInstance(new SurfaceTexturePeerBrowserImpl());
459 } 460 }
460 { 461 {
461 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:DataFetcher") 462 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:DataFetcher")
462 DataFetcherImplAndroid::Init(base::android::AttachCurrentThread()); 463 DataFetcherImplAndroid::Init(base::android::AttachCurrentThread());
463 } 464 }
465 {
466 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SpeechRecognizer")
467 SpeechRecognizerImplAndroid::Init(base::android::AttachCurrentThread());
bulach 2013/06/07 15:35:10 this is not the right place :) more below..
janx 2013/06/10 16:51:18 Renamed to RegisterSpeechRecognizer and moved to c
468 }
464 #endif 469 #endif
465 470
466 if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) { 471 if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
467 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver") 472 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver")
468 memory_observer_.reset(new MemoryObserver()); 473 memory_observer_.reset(new MemoryObserver());
469 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get()); 474 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get());
470 } 475 }
471 } 476 }
472 477
473 void BrowserMainLoop::CreateThreads() { 478 void BrowserMainLoop::CreateThreads() {
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 if (parameters_.ui_task) 911 if (parameters_.ui_task)
907 base::MessageLoopForUI::current()->PostTask(FROM_HERE, 912 base::MessageLoopForUI::current()->PostTask(FROM_HERE,
908 *parameters_.ui_task); 913 *parameters_.ui_task);
909 914
910 base::RunLoop run_loop; 915 base::RunLoop run_loop;
911 run_loop.Run(); 916 run_loop.Run();
912 #endif 917 #endif
913 } 918 }
914 919
915 } // namespace content 920 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/speech/speech_recognition_manager_impl.cc » ('j') | content/browser/speech/speech_recognizer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698