OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 11 matching lines...) Expand all Loading... |
22 namespace net { | 22 namespace net { |
23 class NetworkChangeNotifier; | 23 class NetworkChangeNotifier; |
24 } | 24 } |
25 | 25 |
26 namespace content { | 26 namespace content { |
27 | 27 |
28 class BrowserMainParts; | 28 class BrowserMainParts; |
29 class BrowserShutdownImpl; | 29 class BrowserShutdownImpl; |
30 class BrowserThreadImpl; | 30 class BrowserThreadImpl; |
31 struct MainFunctionParams; | 31 struct MainFunctionParams; |
| 32 class WebKitThread; |
32 | 33 |
33 // Implements the main browser loop stages called from |BrowserMain()|. | 34 // Implements the main browser loop stages called from |BrowserMain()|. |
34 // See comments in browser_main_parts.h for additional info. | 35 // See comments in browser_main_parts.h for additional info. |
35 class BrowserMainLoop { | 36 class BrowserMainLoop { |
36 public: | 37 public: |
37 explicit BrowserMainLoop(const content::MainFunctionParams& parameters); | 38 explicit BrowserMainLoop(const content::MainFunctionParams& parameters); |
38 virtual ~BrowserMainLoop(); | 39 virtual ~BrowserMainLoop(); |
39 | 40 |
40 void Init(); | 41 void Init(); |
41 | 42 |
(...skipping 29 matching lines...) Expand all Loading... |
71 scoped_ptr<SystemMessageWindowWin> system_message_window_; | 72 scoped_ptr<SystemMessageWindowWin> system_message_window_; |
72 #endif | 73 #endif |
73 | 74 |
74 // Destroy parts_ before main_message_loop_ (required) and before other | 75 // Destroy parts_ before main_message_loop_ (required) and before other |
75 // classes constructed in content (but after main_thread_). | 76 // classes constructed in content (but after main_thread_). |
76 scoped_ptr<BrowserMainParts> parts_; | 77 scoped_ptr<BrowserMainParts> parts_; |
77 | 78 |
78 // Members initialized in |InitializeMainThread()| --------------------------- | 79 // Members initialized in |InitializeMainThread()| --------------------------- |
79 // This must get destroyed before other threads that are created in parts_. | 80 // This must get destroyed before other threads that are created in parts_. |
80 scoped_ptr<BrowserThreadImpl> main_thread_; | 81 scoped_ptr<BrowserThreadImpl> main_thread_; |
81 scoped_ptr<BrowserProcessSubThread> io_thread_; | 82 scoped_ptr<BrowserProcessSubThread> db_thread_; |
| 83 scoped_ptr<WebKitThread> webkit_thread_; |
82 scoped_ptr<BrowserProcessSubThread> file_thread_; | 84 scoped_ptr<BrowserProcessSubThread> file_thread_; |
83 scoped_ptr<BrowserProcessSubThread> db_thread_; | |
84 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; | 85 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; |
85 scoped_ptr<BrowserProcessSubThread> cache_thread_; | 86 scoped_ptr<BrowserProcessSubThread> cache_thread_; |
| 87 scoped_ptr<BrowserProcessSubThread> io_thread_; |
86 #if defined(OS_CHROMEOS) | 88 #if defined(OS_CHROMEOS) |
87 scoped_ptr<BrowserProcessSubThread> web_socket_proxy_thread_; | 89 scoped_ptr<BrowserProcessSubThread> web_socket_proxy_thread_; |
88 #endif | 90 #endif |
89 | 91 |
90 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); | 92 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); |
91 }; | 93 }; |
92 | 94 |
93 } // namespace content | 95 } // namespace content |
94 | 96 |
95 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ | 97 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ |
OLD | NEW |