Aura/ash split: Split the extra parts into ash and aura parts.

chrome/chrome_browser.gypi

 # Copyright (c) 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 350 matching lines @@
         'browser/certificate_viewer.cc',
         'browser/certificate_viewer.h',
         'browser/character_encoding.cc',
         'browser/character_encoding.h',
         'browser/chrome_benchmarking_message_filter.cc',
         'browser/chrome_benchmarking_message_filter.h',
         'browser/chrome_browser_application_mac.h',
         'browser/chrome_browser_application_mac.mm',
         'browser/chrome_browser_main.cc',
         'browser/chrome_browser_main.h',
+        'browser/chrome_browser_main_extra_parts.cc',
+        'browser/chrome_browser_main_extra_parts.h',
+        'browser/chrome_browser_main_extra_parts_ash.cc',
+        'browser/chrome_browser_main_extra_parts_ash.h',
+        'browser/chrome_browser_main_extra_parts_aura.cc',
+        'browser/chrome_browser_main_extra_parts_aura.h',
+        'browser/chrome_browser_main_extra_parts_gtk.cc',
+        'browser/chrome_browser_main_extra_parts_gtk.h',
+        'browser/chrome_browser_main_extra_parts_views.cc',
+        'browser/chrome_browser_main_extra_parts_views.h',
         'browser/chrome_browser_main_linux.cc',
         'browser/chrome_browser_main_linux.h',
+        'browser/chrome_browser_main_mac.h',
         'browser/chrome_browser_main_mac.mm',
-        'browser/chrome_browser_main_mac.h',
         'browser/chrome_browser_main_posix.cc',
         'browser/chrome_browser_main_posix.h',
         'browser/chrome_browser_main_win.cc',
         'browser/chrome_browser_main_win.h',
         'browser/chrome_browser_main_x11.cc',
         'browser/chrome_browser_main_x11.h',
-        'browser/chrome_browser_main_extra_parts.cc',
-        'browser/chrome_browser_main_extra_parts.h',
-        'browser/chrome_browser_main_extra_parts_aura.cc',
-        'browser/chrome_browser_main_extra_parts_aura.h',
-        'browser/chrome_browser_main_extra_parts_gtk.cc',
-        'browser/chrome_browser_main_extra_parts_gtk.h',
-        'browser/chrome_browser_main_extra_parts_views.cc',
-        'browser/chrome_browser_main_extra_parts_views.h',
         'browser/chrome_content_browser_client.cc',
         'browser/chrome_content_browser_client.h',
         'browser/chrome_page_zoom_constants.cc',
         'browser/chrome_page_zoom_constants.h',
         'browser/chrome_page_zoom.cc',
         'browser/chrome_page_zoom.h',
         'browser/chrome_plugin_service_filter.cc',
         'browser/chrome_plugin_service_filter.h',
         'browser/chrome_quota_permission_context.cc',
         'browser/chrome_quota_permission_context.h',
@@ skipping 3829 matching lines @@
             'browser/password_manager/native_backend_gnome_x.h',
           ],
         }],
         # linux/chromeos only status area button.
         ['OS=="linux" and use_aura==1', {
           'sources/': [
             ['include', '^browser/chromeos/status/memory_menu_button.cc'],
             ['include', '^browser/chromeos/status/memory_menu_button.h'],
           ],
         }],
+        ['use_ash==1', {
+          'dependencies': [
+            '../ash/ash.gyp:ash',
+          ],
+        }],
         ['use_aura==1', {
           'sources/': [
             ['exclude', '^browser/aeropeek_manager.cc'],
             ['exclude', '^browser/automation/automation_provider_win.cc'],
             ['exclude', '^browser/automation/chrome_frame_automation_provider.cc'],
             ['exclude', '^browser/automation/chrome_frame_automation_provider.h'],
             ['exclude', '^browser/automation/testing_automation_provider_win.cc'],
             ['exclude', '^browser/chromeos/native_dialog_window.cc'],
             ['exclude', '^browser/chromeos/native_dialog_window.h'],
             ['exclude', '^browser/chromeos/frame/bubble_frame_view.h'],
@@ skipping 54 matching lines @@
             #['include', '^browser/ui/views/ash/gesture_prefs_aura.cc'],
             ['include', '^browser/ui/views/simple_message_box_views.cc'],
             ['include', '^browser/ui/views/simple_message_box_views.h'],
             ['include', '^browser/ui/webui/certificate_viewer_webui.cc'],
             ['include', '^browser/ui/webui/certificate_viewer_webui.h'],
             ['include', '^browser/ui/webui/certificate_viewer_ui.cc'],
             ['include', '^browser/ui/webui/certificate_viewer_ui.h'],
           ],
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
-            '../ash/ash.gyp:ash',
             '../ui/gfx/compositor/compositor.gyp:compositor',
           ],
         }],
         ['ui_compositor_image_transport==1', {
           'dependencies': [
             '../ui/gfx/gl/gl.gyp:gl',
           ],
         }],
         ['use_virtual_keyboard==0', {
           'sources/': [
@@ skipping 1031 matching lines @@
          'variables': {
           'proto_in_dir': '../third_party/cros_system_api/dbus/',
           'proto_out_dir': 'chrome/browser/chromeos/dbus',
          },
          'includes': ['../build/protoc.gypi'],
         }],
       ],
     },
   ],
 }