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

Unified Diff: content/shell/shell_browser_main.h

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix official build, avoid DCHECK in official Linux/ChromeOS builds. Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/shell_browser_context.cc ('k') | content/shell/shell_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_browser_main.h
diff --git a/content/shell/shell_browser_main.h b/content/shell/shell_browser_main.h
index 0e617cade2f27f2e562ecf28c5d46921e0e92faa..ffa44e641fbab6bb63ff9799d833cd3741d6c131 100644
--- a/content/shell/shell_browser_main.h
+++ b/content/shell/shell_browser_main.h
@@ -35,28 +35,25 @@ class ShellBrowserMainParts : public BrowserMainParts {
virtual void PreMainMessageLoopStart() OVERRIDE {}
virtual void ToolkitInitialized() OVERRIDE {}
virtual void PostMainMessageLoopStart() OVERRIDE {}
- virtual void PreMainMessageLoopRun() OVERRIDE;
+ virtual void PreCreateThreads() OVERRIDE;
+ virtual void PreStartThread(BrowserThread::ID id) OVERRIDE {}
+ virtual void PostStartThread(BrowserThread::ID id) OVERRIDE {}
+ virtual void PreMainMessageLoopRun() OVERRIDE {}
virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
- virtual void PostMainMessageLoopRun() OVERRIDE {}
+ virtual void PostMainMessageLoopRun() OVERRIDE;
+ virtual void PreStopThread(BrowserThread::ID id) OVERRIDE;
+ virtual void PostStopThread(BrowserThread::ID) OVERRIDE {}
+ virtual void PostDestroyThreads() OVERRIDE {}
ResourceDispatcherHost* GetResourceDispatcherHost();
ui::Clipboard* GetClipboard();
- base::Thread* io_thread() { return io_thread_.get(); }
- base::Thread* file_thread() { return file_thread_.get(); }
-
private:
scoped_ptr<ShellBrowserContext> browser_context_;
scoped_ptr<ResourceDispatcherHost> resource_dispatcher_host_;
scoped_ptr<ui::Clipboard> clipboard_;
- scoped_ptr<base::Thread> io_thread_;
- scoped_ptr<base::Thread> file_thread_;
- scoped_ptr<base::Thread> db_thread_;
- scoped_ptr<base::Thread> process_launcher_thread_;
- scoped_ptr<base::Thread> cache_thread_;
-
DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
};
« no previous file with comments | « content/shell/shell_browser_context.cc ('k') | content/shell/shell_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698