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

Unified Diff: content/shell/shell_browser_main.h

Issue 9190018: Support sharing of ContentMain and BrowserMain code with embedded use cases. (Closed) Base URL: svn://svn.chromium.org/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 side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698