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

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

Issue 9146007: Get rid of BrowserThread::WEB_SOCKET_PROXY. BrowserThread is only for threads that are used in ma... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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 | « chrome/browser/metrics/thread_watcher.cc ('k') | 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) 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_user_blocking_thread_;
85 scoped_ptr<BrowserProcessSubThread> file_thread_; 85 scoped_ptr<BrowserProcessSubThread> file_thread_;
86 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_; 86 scoped_ptr<BrowserProcessSubThread> process_launcher_thread_;
87 scoped_ptr<BrowserProcessSubThread> cache_thread_; 87 scoped_ptr<BrowserProcessSubThread> cache_thread_;
88 scoped_ptr<BrowserProcessSubThread> io_thread_; 88 scoped_ptr<BrowserProcessSubThread> io_thread_;
89 #if defined(OS_CHROMEOS)
90 scoped_ptr<BrowserProcessSubThread> web_socket_proxy_thread_;
91 #endif
92 89
93 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 90 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
94 }; 91 };
95 92
96 } // namespace content 93 } // namespace content
97 94
98 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 95 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « chrome/browser/metrics/thread_watcher.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698