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

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

Issue 10399025: Moved instantiation of SpeechRecognitionManager inside browser_main_loop, instead of Singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed build issues. Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 14 matching lines...) Expand all
25 } 25 }
26 26
27 namespace media { 27 namespace media {
28 class AudioManager; 28 class AudioManager;
29 } 29 }
30 30
31 namespace net { 31 namespace net {
32 class NetworkChangeNotifier; 32 class NetworkChangeNotifier;
33 } 33 }
34 34
35 namespace speech {
36 class SpeechRecognitionManagerImpl;
37 }
38
35 namespace content { 39 namespace content {
36 40
37 class BrowserMainParts; 41 class BrowserMainParts;
38 class BrowserShutdownImpl; 42 class BrowserShutdownImpl;
39 class BrowserThreadImpl; 43 class BrowserThreadImpl;
40 struct MainFunctionParams; 44 struct MainFunctionParams;
41 class ResourceDispatcherHostImpl; 45 class ResourceDispatcherHostImpl;
42 class WebKitThread; 46 class WebKitThread;
43 47
44 // Implements the main browser loop stages called from BrowserMainRunner. 48 // Implements the main browser loop stages called from BrowserMainRunner.
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // Destroy parts_ before main_message_loop_ (required) and before other 105 // Destroy parts_ before main_message_loop_ (required) and before other
102 // classes constructed in content (but after main_thread_). 106 // classes constructed in content (but after main_thread_).
103 scoped_ptr<BrowserMainParts> parts_; 107 scoped_ptr<BrowserMainParts> parts_;
104 108
105 // Members initialized in |InitializeMainThread()| --------------------------- 109 // Members initialized in |InitializeMainThread()| ---------------------------
106 // This must get destroyed before other threads that are created in parts_. 110 // This must get destroyed before other threads that are created in parts_.
107 scoped_ptr<BrowserThreadImpl> main_thread_; 111 scoped_ptr<BrowserThreadImpl> main_thread_;
108 112
109 // Members initialized in |BrowserThreadsStarted()| -------------------------- 113 // Members initialized in |BrowserThreadsStarted()| --------------------------
110 scoped_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 114 scoped_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
115 scoped_ptr<speech::SpeechRecognitionManagerImpl> speech_recognition_manager_;
111 116
112 // Members initialized in |RunMainMessageLoopParts()| ------------------------ 117 // Members initialized in |RunMainMessageLoopParts()| ------------------------
113 scoped_ptr<BrowserProcessSubThread> db_thread_; 118 scoped_ptr<BrowserProcessSubThread> db_thread_;
114 scoped_ptr<WebKitThread> webkit_thread_; 119 scoped_ptr<WebKitThread> webkit_thread_;
115 scoped_ptr<BrowserProcessSubThread> file_user_blocking_thread_; 120 scoped_ptr<BrowserProcessSubThread> file_user_blocking_thread_;
116 scoped_ptr<BrowserProcessSubThread> file_thread_; 121 scoped_ptr<BrowserProcessSubThread> file_thread_;
117 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; 122 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_;
118 scoped_ptr<BrowserProcessSubThread> cache_thread_; 123 scoped_ptr<BrowserProcessSubThread> cache_thread_;
119 scoped_ptr<BrowserProcessSubThread> io_thread_; 124 scoped_ptr<BrowserProcessSubThread> io_thread_;
120 125
121 #if defined(OS_WIN) 126 #if defined(OS_WIN)
122 ui::ScopedOleInitializer ole_initializer_; 127 ui::ScopedOleInitializer ole_initializer_;
123 #endif 128 #endif
124 129
125 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 130 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
126 }; 131 };
127 132
128 } // namespace content 133 } // namespace content
129 134
130 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 135 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698