Make GTK and Aura parts orthogonal to OS parts

content/shell/shell_browser_main.h

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..ca4d59d62113ce9382dd2dfd388f031a65008b7b 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 {};

[jam, 2011/10/24 19:36:00]

nit: don't need semicolon

[stevenjb, 2011/10/25 02:51:04]

Done.

+  virtual void PostEarlyInitialization() OVERRIDE {}
+  virtual void PreMainMessageLoopStart() OVERRIDE {}
+  virtual void ToolkitInitialized() OVERRIDE {}
+  virtual void PostMainMessageLoopStart() OVERRIDE {};

[jam, 2011/10/24 19:36:00]

ditto

[stevenjb, 2011/10/25 02:51:04]

Done.

+  virtual int PreMainMessageLoopRun() OVERRIDE;
+  virtual bool MainMessageLoopRun() OVERRIDE { return false; }

[jam, 2011/10/24 19:36:00]

i believe this will give a clang error

[stevenjb, 2011/10/25 02:51:04]

Done.

+  virtual void PostMainMessageLoopRun() {}
 
   ResourceDispatcherHost* GetResourceDispatcherHost();
   ui::Clipboard* GetClipboard();