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..ea564250eaab718e65448e022d63fc4e36175942 100644
--- a/apps/shell/app/shell_main_delegate.h
+++ b/apps/shell/app/shell_main_delegate.h
@@ -5,19 +5,23 @@
 #ifndef APPS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
 #define APPS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
 
+#include "apps/shell/common/start_callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/app/content_main_delegate.h"
 
-namespace apps {
+namespace content {
+class BrowserContext;
+class ContentBrowserClient;
+class ContentClient;
+class ContentRendererClient;
+}
 
-class ShellContentBrowserClient;
-class ShellContentClient;
-class ShellContentRendererClient;
+namespace apps {
 
 class ShellMainDelegate : public content::ContentMainDelegate {
  public:
-  ShellMainDelegate();
+  explicit ShellMainDelegate(StartCallback* start_callback);

[James Cook, 2014/05/08 21:27:24]

Please add a comment saying that StartCallback will only be used in the browser
process (since ShellMainDelegate is code used in all processes).

   virtual ~ShellMainDelegate();
 
   // ContentMainDelegate implementation:
@@ -35,9 +39,9 @@ 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
 };