Separate athena's startup process from AppShell's

extensions/shell/browser/shell_browser_main_delegate.h

Index: extensions/shell/browser/shell_browser_main_delegate.h
diff --git a/extensions/shell/browser/shell_browser_main_delegate.h b/extensions/shell/browser/shell_browser_main_delegate.h
index 3dbbbab2cfaff61be4040e164660ee20af019f00..1b234c514d3c131a6f8a3485d66b6ea5a6cf08f2 100644
--- a/extensions/shell/browser/shell_browser_main_delegate.h
+++ b/extensions/shell/browser/shell_browser_main_delegate.h
@@ -11,7 +11,7 @@ class BrowserContext;
 
 namespace extensions {
 
-class ShellDesktopController;
+class DesktopController;
 
 class ShellBrowserMainDelegate {
  public:
@@ -28,7 +28,7 @@ class ShellBrowserMainDelegate {
   // Creates the ShellDesktopController instance to initialize the root window
   // and window manager. Subclass may return its subclass to customize the
   // windo manager.
-  virtual ShellDesktopController* CreateDesktopController() = 0;
+  virtual DesktopController* CreateDesktopController() = 0;
 };
 
 }  // namespace extensions