Separate athena's startup process from AppShell's

extensions/shell/app_shell.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 33 matching lines @@
       ],
       'sources': [
         'app/shell_main_delegate.cc',
         'app/shell_main_delegate.h',
         'browser/api/shell/shell_api.cc',
         'browser/api/shell/shell_api.h',
         'browser/api/shell_extensions_api_client.cc',
         'browser/api/shell_extensions_api_client.h',
         'browser/default_shell_browser_main_delegate.cc',
         'browser/default_shell_browser_main_delegate.h',
-        'browser/default_shell_app_window_controller.cc',

[James Cook, 2014/08/25 16:56:14]

Can this file be deleted?

[oshima, 2014/08/25 17:29:32]

Done.

-        'browser/default_shell_app_window_controller.h',
+        'browser/desktop_controller.cc',
+        'browser/desktop_controller.h',
         'browser/media_capture_util.cc',
         'browser/media_capture_util.h',
         'browser/shell_app_sorting.cc',
         'browser/shell_app_sorting.h',
         'browser/shell_app_window.cc',
         'browser/shell_app_window.h',
         'browser/shell_app_window_controller.h',
         'browser/shell_browser_context.cc',
         'browser/shell_browser_context.h',
         'browser/shell_browser_main_delegate.h',
@@ skipping 184 matching lines @@
             '<@(_outputs)',
           ],
           'includes': [
             '../../build/util/version.gypi',
           ],
         },
       ],
     },
   ],  # targets
 }