Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations.

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 20 matching lines @@
         '<(DEPTH)/extensions/extensions.gyp:extensions_renderer',
         '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
         '<(DEPTH)/extensions/extensions.gyp:extensions_utility',
         '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
         '<(DEPTH)/extensions/shell/browser/api/api_registration.gyp:shell_api_registration',
         '<(DEPTH)/extensions/shell/common/api/api.gyp:shell_api',
         '<(DEPTH)/mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-        '<(DEPTH)/ui/wm/wm.gyp:wm',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
       ],
       'include_dirs': [
         '../..',
         '<(SHARED_INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/extensions/shell',
       ],
       'sources': [
         'app/shell_main_delegate.cc',
         'app/shell_main_delegate.h',
@@ skipping 15 matching lines @@
         'browser/shell_app_window_client.h',
         'browser/shell_audio_controller_chromeos.cc',
         'browser/shell_audio_controller_chromeos.h',
         'browser/shell_browser_context.cc',
         'browser/shell_browser_context.h',
         'browser/shell_browser_main_delegate.h',
         'browser/shell_browser_main_parts.cc',
         'browser/shell_browser_main_parts.h',
         'browser/shell_content_browser_client.cc',
         'browser/shell_content_browser_client.h',
-        'browser/shell_desktop_controller.cc',
-        'browser/shell_desktop_controller.h',
         'browser/shell_device_client.cc',
         'browser/shell_device_client.h',
         'browser/shell_display_info_provider.cc',
         'browser/shell_display_info_provider.h',
         'browser/shell_extension_host_delegate.cc',
         'browser/shell_extension_host_delegate.h',
         'browser/shell_extension_system.cc',
         'browser/shell_extension_system.h',
         'browser/shell_extension_system_factory.cc',
         'browser/shell_extension_system_factory.h',
@@ skipping 27 matching lines @@
         'common/switches.cc',
         'common/switches.h',
         'renderer/shell_content_renderer_client.cc',
         'renderer/shell_content_renderer_client.h',
         'renderer/shell_extensions_renderer_client.cc',
         'renderer/shell_extensions_renderer_client.h',
         'utility/shell_content_utility_client.cc',
         'utility/shell_content_utility_client.h',
       ],
       'conditions': [
+        ['use_aura==1', {
+          'dependencies': [
+            '<(DEPTH)/ui/wm/wm.gyp:wm',
+          ],
+          'sources': [
+            'browser/shell_app_window_client_aura.cc',
+            'browser/shell_desktop_controller_aura.cc',
+            'browser/shell_desktop_controller_aura.h',
+            'browser/shell_native_app_window_aura.cc',
+            'browser/shell_native_app_window_aura.h',
+          ],
+        }],
         ['chromeos==1', {
           'dependencies': [
             '<(DEPTH)/chromeos/chromeos.gyp:chromeos',
             '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos',
             '<(DEPTH)/ui/display/display.gyp:display',
           ],
           'sources': [
             'browser/api/shell_gcd/shell_gcd_api.cc',
             'browser/api/shell_gcd/shell_gcd_api.h',
           ],
@@ skipping 113 matching lines @@
         '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
         '<(DEPTH)/extensions/extensions.gyp:extensions_test_support',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/ui/aura/aura.gyp:aura_test_support',
       ],
       'sources': [
         '../test/extensions_unittests_main.cc',
         'browser/api/identity/identity_api_unittest.cc',
         'browser/api/shell_window/shell_window_api_unittest.cc',
         'browser/shell_audio_controller_chromeos_unittest.cc',
-        'browser/shell_desktop_controller_unittest.cc',
+        'browser/shell_native_app_window_aura_unittest.cc',
         'browser/shell_oauth2_token_service_unittest.cc',
         'common/shell_content_client_unittest.cc'
       ],
       'conditions': [
         ['disable_nacl==0', {
           'sources': [
             'browser/shell_nacl_browser_delegate_unittest.cc',
           ],
         }],
+        ['use_aura==1', {
+          'sources': [
+            'browser/shell_desktop_controller_aura_unittest.cc',
+          ],
+        }],
         ['chromeos==1', {
           'dependencies': [
             '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
           ],
           'sources': [
             'browser/api/shell_gcd/shell_gcd_api_unittest.cc',
           ],
         }],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
@@ skipping 34 matching lines @@
             '<@(_outputs)',
           ],
           'includes': [
             '../../build/util/version.gypi',
           ],
         },
       ],
     },
   ],  # targets
 }