Separate athena's startup process from AppShell's

extensions/shell/browser/shell_browser_main_parts.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
 #define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/common/main_function_params.h"
 #include "ui/aura/window_tree_host_observer.h"
 
 namespace content {
 class ShellDevToolsDelegate;
 struct MainFunctionParams;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace net {
 class NetLog;
 }
 
 namespace extensions {
 
+class DesktopController;
 class ShellBrowserContext;
 class ShellBrowserMainDelegate;
-class ShellDesktopController;
 class ShellExtensionsBrowserClient;
 class ShellExtensionsClient;
 class ShellExtensionSystem;
 class ShellOmahaQueryParamsDelegate;
 
 #if defined(OS_CHROMEOS)
 class ShellNetworkController;
 #endif
 
 // Handles initialization of AppShell.
@@ skipping 17 matching lines @@
   virtual void PostMainMessageLoopRun() OVERRIDE;
   virtual void PostDestroyThreads() OVERRIDE;
 
  private:
   // Creates and initializes the ExtensionSystem.
   void CreateExtensionSystem();
 
 #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_;
   scoped_ptr<net::NetLog> net_log_;
   scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_;
   scoped_ptr<ShellOmahaQueryParamsDelegate> omaha_query_params_delegate_;
 
   // Owned by the KeyedService system.
   ShellExtensionSystem* extension_system_;
 
   // For running app browsertests.
   const content::MainFunctionParams parameters_;
 
   // If true, indicates the main message loop should be run
   // in MainMessageLoopRun. If false, it has already been run.
   bool run_message_loop_;
 
   scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_