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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 | 74 |
75 // Destroy parts_ before main_message_loop_ (required) and before other | 75 // Destroy parts_ before main_message_loop_ (required) and before other |
76 // classes constructed in content (but after main_thread_). | 76 // classes constructed in content (but after main_thread_). |
77 scoped_ptr<BrowserMainParts> parts_; | 77 scoped_ptr<BrowserMainParts> parts_; |
78 | 78 |
79 // Members initialized in |InitializeMainThread()| --------------------------- | 79 // Members initialized in |InitializeMainThread()| --------------------------- |
80 // 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_. |
81 scoped_ptr<BrowserThreadImpl> main_thread_; | 81 scoped_ptr<BrowserThreadImpl> main_thread_; |
82 scoped_ptr<BrowserProcessSubThread> db_thread_; | 82 scoped_ptr<BrowserProcessSubThread> db_thread_; |
83 scoped_ptr<WebKitThread> webkit_thread_; | 83 scoped_ptr<WebKitThread> webkit_thread_; |
| 84 scoped_ptr<BrowserProcessSubThread> file_user_blocking_thread_; |
84 scoped_ptr<BrowserProcessSubThread> file_thread_; | 85 scoped_ptr<BrowserProcessSubThread> file_thread_; |
85 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; | 86 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; |
86 scoped_ptr<BrowserProcessSubThread> cache_thread_; | 87 scoped_ptr<BrowserProcessSubThread> cache_thread_; |
87 scoped_ptr<BrowserProcessSubThread> io_thread_; | 88 scoped_ptr<BrowserProcessSubThread> io_thread_; |
88 #if defined(OS_CHROMEOS) | 89 #if defined(OS_CHROMEOS) |
89 scoped_ptr<BrowserProcessSubThread> web_socket_proxy_thread_; | 90 scoped_ptr<BrowserProcessSubThread> web_socket_proxy_thread_; |
90 #endif | 91 #endif |
91 | 92 |
92 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); | 93 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); |
93 }; | 94 }; |
94 | 95 |
95 } // namespace content | 96 } // namespace content |
96 | 97 |
97 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ | 98 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ |
OLD | NEW |