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

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b841751567fcfa54ec380b331309b804c48a090f..0bce2501d1906d3cc86ee73a11b9793d3a65b9b4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -368,24 +368,26 @@
         '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.mm',
         'browser/chrome_browser_main_mac.h',
+        'browser/chrome_browser_main_mac.mm',
         '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',
@@ -4235,6 +4237,11 @@
             ['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'],
@@ -4309,7 +4316,6 @@
           ],
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
-            '../ash/ash.gyp:ash',
             '../ui/gfx/compositor/compositor.gyp:compositor',
           ],
         }],