Separate athena's startup process from AppShell's

extensions/shell/browser/default_shell_browser_main_delegate.cc

 // 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.
 
 #include "extensions/shell/browser/default_shell_browser_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
-#include "extensions/shell/browser/default_shell_app_window_controller.h"
 #include "extensions/shell/browser/shell_desktop_controller.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 #include "extensions/shell/common/switches.h"
 
 namespace extensions {
 
 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() {
 }
 
 DefaultShellBrowserMainDelegate::~DefaultShellBrowserMainDelegate() {
@@ skipping 14 matching lines @@
     extension_system->LaunchApp();
   } else {
     LOG(ERROR) << "--" << switches::kAppShellAppPath
                << " unset; boredom is in your future";
   }
 }
 
 void DefaultShellBrowserMainDelegate::Shutdown() {
 }
 
-ShellDesktopController*
-DefaultShellBrowserMainDelegate::CreateDesktopController() {
-  ShellDesktopController* desktop = new ShellDesktopController();
-  desktop->SetAppWindowController(new DefaultShellAppWindowController(desktop));
-  return desktop;
+DesktopController* DefaultShellBrowserMainDelegate::CreateDesktopController() {
+  return new ShellDesktopController();
 }
 
 }  // namespace extensions