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

Unified Diff: content/shell/shell_browser_main.h

Issue 8302016: Make GTK and Aura parts orthogonal to OS parts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 2 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
« no previous file with comments | « content/public/browser/content_browser_client.h ('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 5d46e1fb8fc9a482d7545feebb560b7b74afa7d0..7e43d88680a8814f2a00dba21c3fb9b211472eaf 100644
--- a/content/shell/shell_browser_main.h
+++ b/content/shell/shell_browser_main.h
@@ -6,10 +6,12 @@
#define CONTENT_SHELL_SHELL_BROWSER_MAIN_H_
#pragma once
+#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
-#include "content/browser/browser_main.h"
+#include "content/public/browser/browser_main_parts.h"
class ResourceDispatcherHost;
+struct MainFunctionParams;
namespace base {
class Thread;
@@ -28,7 +30,14 @@ class ShellBrowserMainParts : public BrowserMainParts {
explicit ShellBrowserMainParts(const MainFunctionParams& parameters);
virtual ~ShellBrowserMainParts();
- virtual void PreMainMessageLoopRun();
+ virtual void PreEarlyInitialization() OVERRIDE {}
+ virtual void PostEarlyInitialization() OVERRIDE {}
+ virtual void PreMainMessageLoopStart() OVERRIDE {}
+ virtual void ToolkitInitialized() OVERRIDE {}
+ virtual void PostMainMessageLoopStart() OVERRIDE {}
+ virtual void PreMainMessageLoopRun() OVERRIDE;
+ virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
+ virtual void PostMainMessageLoopRun() {}
ResourceDispatcherHost* GetResourceDispatcherHost();
ui::Clipboard* GetClipboard();
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | content/shell/shell_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698