Minimal athena shell main

apps/shell/app/shell_main_delegate.h

Index: apps/shell/app/shell_main_delegate.h
diff --git a/apps/shell/app/shell_main_delegate.h b/apps/shell/app/shell_main_delegate.h
index 6af939501a3896919eb1487ef07ea49769d8eea6..bce8cc792ac1548cabf9cc0784a36dc42df0f5f5 100644
--- a/apps/shell/app/shell_main_delegate.h
+++ b/apps/shell/app/shell_main_delegate.h
@@ -9,15 +9,18 @@
 #include "base/memory/scoped_ptr.h"
 #include "content/public/app/content_main_delegate.h"
 
-namespace apps {
+namespace content {
+class ContentClient;
+class ContentBrowserClient;
+class ContentRendererClient;
+}
 
-class ShellContentBrowserClient;
-class ShellContentClient;
-class ShellContentRendererClient;
+namespace apps {
+class ShellDelegate;
 
 class ShellMainDelegate : public content::ContentMainDelegate {
  public:
-  ShellMainDelegate();
+  explicit ShellMainDelegate(ShellDelegate* shell_delegate);
   virtual ~ShellMainDelegate();
 
   // ContentMainDelegate implementation:
@@ -35,9 +38,11 @@ class ShellMainDelegate : public content::ContentMainDelegate {
   // Initializes the resource bundle and resources.pak.
   static void InitializeResourceBundle();
 
-  scoped_ptr<ShellContentClient> content_client_;
-  scoped_ptr<ShellContentBrowserClient> browser_client_;
-  scoped_ptr<ShellContentRendererClient> renderer_client_;
+  scoped_ptr<content::ContentClient> content_client_;
+  scoped_ptr<content::ContentBrowserClient> browser_client_;
+  scoped_ptr<content::ContentRendererClient> renderer_client_;
+
+  ShellDelegate* shell_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
 };