Separate athena's startup process from AppShell's

extensions/shell/browser/shell_browser_main_parts.h

Index: extensions/shell/browser/shell_browser_main_parts.h
diff --git a/extensions/shell/browser/shell_browser_main_parts.h b/extensions/shell/browser/shell_browser_main_parts.h
index 83915cba66d3cbd3b8c1f85dde9795bee004f6ff..e8e1b20f287ffe0e68cae56f6fc4592f75cdc5da 100644
--- a/extensions/shell/browser/shell_browser_main_parts.h
+++ b/extensions/shell/browser/shell_browser_main_parts.h
@@ -27,9 +27,9 @@ class NetLog;
 
 namespace extensions {
 
+class DesktopController;
 class ShellBrowserContext;
 class ShellBrowserMainDelegate;
-class ShellDesktopController;
 class ShellExtensionsBrowserClient;
 class ShellExtensionsClient;
 class ShellExtensionSystem;
@@ -67,7 +67,7 @@ class ShellBrowserMainParts : public content::BrowserMainParts {
 #if defined(OS_CHROMEOS)
   scoped_ptr<ShellNetworkController> network_controller_;
 #endif
-  scoped_ptr<ShellDesktopController> desktop_controller_;
+  scoped_ptr<DesktopController> desktop_controller_;
   scoped_ptr<ShellBrowserContext> browser_context_;
   scoped_ptr<ShellExtensionsClient> extensions_client_;
   scoped_ptr<ShellExtensionsBrowserClient> extensions_browser_client_;