Index: content/shell/shell_browser_main.h |
=================================================================== |
--- content/shell/shell_browser_main.h (revision 117304) |
+++ content/shell/shell_browser_main.h (working copy) |
@@ -10,6 +10,8 @@ |
#include "base/memory/scoped_ptr.h" |
#include "content/public/browser/browser_main_parts.h" |
+class ShellMainDelegate; |
+ |
namespace base { |
class Thread; |
} |
@@ -25,14 +27,16 @@ |
class ShellBrowserMainParts : public BrowserMainParts { |
public: |
- explicit ShellBrowserMainParts(const content::MainFunctionParams& parameters); |
+ explicit ShellBrowserMainParts(ShellMainDelegate* delegate, |
+ const content::MainFunctionParams& parameters); |
virtual ~ShellBrowserMainParts(); |
virtual void PreEarlyInitialization() OVERRIDE {} |
virtual void PostEarlyInitialization() OVERRIDE {} |
virtual void PreMainMessageLoopStart() OVERRIDE {} |
+ virtual MessageLoop* GetMainMessageLoop() OVERRIDE; |
+ virtual void PostMainMessageLoopStart() OVERRIDE {} |
virtual void ToolkitInitialized() OVERRIDE {} |
- virtual void PostMainMessageLoopStart() OVERRIDE {} |
virtual void PreCreateThreads() OVERRIDE {} |
virtual void PreMainMessageLoopRun() OVERRIDE; |
virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; |
@@ -42,6 +46,9 @@ |
ui::Clipboard* GetClipboard(); |
private: |
+ // The delegate will always outlive this class. |
+ ShellMainDelegate* delegate_; |
+ |
scoped_ptr<ShellBrowserContext> browser_context_; |
scoped_ptr<ui::Clipboard> clipboard_; |