| Index: content/shell/shell_browser_main.h
|
| ===================================================================
|
| --- content/shell/shell_browser_main.h (revision 116798)
|
| +++ content/shell/shell_browser_main.h (working copy)
|
| @@ -10,8 +10,6 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/browser_main_parts.h"
|
|
|
| -class ResourceDispatcherHost;
|
| -
|
| namespace base {
|
| class Thread;
|
| }
|
| @@ -36,22 +34,16 @@
|
| virtual void ToolkitInitialized() OVERRIDE {}
|
| virtual void PostMainMessageLoopStart() 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 PreStopThread(BrowserThread::ID id) OVERRIDE;
|
| - virtual void PostStopThread(BrowserThread::ID) OVERRIDE {}
|
| virtual void PostDestroyThreads() OVERRIDE {}
|
|
|
| - ResourceDispatcherHost* GetResourceDispatcherHost();
|
| ui::Clipboard* GetClipboard();
|
|
|
| private:
|
| scoped_ptr<ShellBrowserContext> browser_context_;
|
|
|
| - scoped_ptr<ResourceDispatcherHost> resource_dispatcher_host_;
|
| scoped_ptr<ui::Clipboard> clipboard_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
|
|
|