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

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

Issue 11347004: content/browser: Move speech code into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
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 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 5 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/browser/browser_process_sub_thread.h" 10 #include "content/browser/browser_process_sub_thread.h"
(...skipping 13 matching lines...) Expand all
24 } 24 }
25 25
26 namespace media_stream { 26 namespace media_stream {
27 class MediaStreamManager; 27 class MediaStreamManager;
28 } 28 }
29 29
30 namespace net { 30 namespace net {
31 class NetworkChangeNotifier; 31 class NetworkChangeNotifier;
32 } 32 }
33 33
34 namespace speech {
35 class SpeechRecognitionManagerImpl;
36 }
37
38 namespace content { 34 namespace content {
39 35
40 class BrowserMainParts; 36 class BrowserMainParts;
41 class BrowserShutdownImpl; 37 class BrowserShutdownImpl;
42 class BrowserThreadImpl; 38 class BrowserThreadImpl;
43 class ResourceDispatcherHostImpl; 39 class ResourceDispatcherHostImpl;
40 class SpeechRecognitionManagerImpl;
44 class WebKitThread; 41 class WebKitThread;
45 struct MainFunctionParams; 42 struct MainFunctionParams;
46 43
47 #if defined(OS_LINUX) 44 #if defined(OS_LINUX)
48 class DeviceMonitorLinux; 45 class DeviceMonitorLinux;
49 #elif defined(OS_MACOSX) 46 #elif defined(OS_MACOSX)
50 class DeviceMonitorMac; 47 class DeviceMonitorMac;
51 #endif 48 #endif
52 49
53 // Implements the main browser loop stages called from BrowserMainRunner. 50 // Implements the main browser loop stages called from BrowserMainRunner.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // Destroy parts_ before main_message_loop_ (required) and before other 113 // Destroy parts_ before main_message_loop_ (required) and before other
117 // classes constructed in content (but after main_thread_). 114 // classes constructed in content (but after main_thread_).
118 scoped_ptr<BrowserMainParts> parts_; 115 scoped_ptr<BrowserMainParts> parts_;
119 116
120 // Members initialized in |InitializeMainThread()| --------------------------- 117 // Members initialized in |InitializeMainThread()| ---------------------------
121 // This must get destroyed before other threads that are created in parts_. 118 // This must get destroyed before other threads that are created in parts_.
122 scoped_ptr<BrowserThreadImpl> main_thread_; 119 scoped_ptr<BrowserThreadImpl> main_thread_;
123 120
124 // Members initialized in |BrowserThreadsStarted()| -------------------------- 121 // Members initialized in |BrowserThreadsStarted()| --------------------------
125 scoped_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 122 scoped_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
126 scoped_ptr<speech::SpeechRecognitionManagerImpl> speech_recognition_manager_; 123 scoped_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
127 124
128 // Members initialized in |RunMainMessageLoopParts()| ------------------------ 125 // Members initialized in |RunMainMessageLoopParts()| ------------------------
129 scoped_ptr<BrowserProcessSubThread> db_thread_; 126 scoped_ptr<BrowserProcessSubThread> db_thread_;
130 #if !defined(OS_IOS) 127 #if !defined(OS_IOS)
131 scoped_ptr<WebKitThread> webkit_thread_; 128 scoped_ptr<WebKitThread> webkit_thread_;
132 #endif 129 #endif
133 scoped_ptr<BrowserProcessSubThread> file_user_blocking_thread_; 130 scoped_ptr<BrowserProcessSubThread> file_user_blocking_thread_;
134 scoped_ptr<BrowserProcessSubThread> file_thread_; 131 scoped_ptr<BrowserProcessSubThread> file_thread_;
135 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; 132 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_;
136 scoped_ptr<BrowserProcessSubThread> cache_thread_; 133 scoped_ptr<BrowserProcessSubThread> cache_thread_;
137 scoped_ptr<BrowserProcessSubThread> io_thread_; 134 scoped_ptr<BrowserProcessSubThread> io_thread_;
138 135
139 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 136 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
140 }; 137 };
141 138
142 } // namespace content 139 } // namespace content
143 140
144 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 141 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | content/browser/speech/proto/google_streaming_api.proto » ('J')

Powered by Google App Engine
This is Rietveld 408576698