Aura/ash split: Remove hacks and get chrome linking without ash.

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 992 matching lines @@
         'browser/first_run/try_chrome_dialog_view.cc',
         'browser/first_run/try_chrome_dialog_view.h',
         'browser/first_run/upgrade_util.cc',
         'browser/first_run/upgrade_util.h',
         'browser/first_run/upgrade_util_linux.cc',
         'browser/first_run/upgrade_util_linux.h',
         'browser/first_run/upgrade_util_mac.cc',
         'browser/first_run/upgrade_util_win.cc',
         'browser/first_run/upgrade_util_win.h',
         'browser/fullscreen.h',
+        'browser/fullscreen_ash.cc',
         'browser/fullscreen_aura.cc',
         'browser/fullscreen_gtk.cc',
         'browser/fullscreen_mac.mm',
         'browser/fullscreen_win.cc',
         'browser/geolocation/chrome_access_token_store.cc',
         'browser/geolocation/chrome_access_token_store.h',
         'browser/geolocation/chrome_geolocation_permission_context.cc',
         'browser/geolocation/chrome_geolocation_permission_context.h',
         'browser/geolocation/geolocation_prefs.cc',
         'browser/geolocation/geolocation_prefs.h',
@@ skipping 2123 matching lines @@
         'browser/ui/tab_contents/core_tab_helper.cc',
         'browser/ui/tab_contents/core_tab_helper.h',
         'browser/ui/tab_contents/core_tab_helper_delegate.cc',
         'browser/ui/tab_contents/core_tab_helper_delegate.h',
         'browser/ui/tab_contents/tab_contents_wrapper.cc',
         'browser/ui/tab_contents/tab_contents_wrapper.h',
         'browser/ui/tab_modal_confirm_dialog_delegate.cc',
         'browser/ui/tab_modal_confirm_dialog_delegate.h',
         'browser/ui/tabs/dock_info.cc',
         'browser/ui/tabs/dock_info.h',
+        'browser/ui/tabs/dock_info_ash.cc',
         'browser/ui/tabs/dock_info_aura.cc',
         'browser/ui/tabs/dock_info_gtk.cc',
         'browser/ui/tabs/dock_info_mac.cc',
         'browser/ui/tabs/dock_info_win.cc',
         'browser/ui/tabs/hover_tab_selector.cc',
         'browser/ui/tabs/hover_tab_selector.h',
         'browser/ui/tabs/tab_menu_model.cc',
         'browser/ui/tabs/tab_menu_model.h',
         'browser/ui/tabs/tab_resources.cc',
         'browser/ui/tabs/tab_resources.h',
@@ skipping 309 matching lines @@
         'browser/ui/views/password_generation_bubble_view.cc',
         'browser/ui/views/password_generation_bubble_view.h',
         'browser/ui/views/reload_button.cc',
         'browser/ui/views/reload_button.h',
         'browser/ui/views/sad_tab_view.cc',
         'browser/ui/views/sad_tab_view.h',
         'browser/ui/views/select_file_dialog_aura.cc',
         'browser/ui/views/select_file_dialog_extension.cc',
         'browser/ui/views/select_file_dialog_extension.h',
         'browser/ui/views/select_file_dialog_win.cc',
-        'browser/ui/views/ash/color_chooser_aura.cc',
+        'browser/ui/views/color_chooser_aura.cc',
         'browser/ui/views/color_chooser_win.cc',
         'browser/ui/views/color_chooser_dialog.cc',
         'browser/ui/views/color_chooser_dialog.h',
         'browser/ui/views/simple_message_box_win.cc',
         'browser/ui/views/simple_message_box_views.cc',
         'browser/ui/views/simple_message_box_views.h',
         'browser/ui/views/ssl_client_certificate_selector.cc',
         'browser/ui/views/ssl_client_certificate_selector.h',
         'browser/ui/views/status_bubble_views.cc',
         'browser/ui/views/status_bubble_views.h',
@@ skipping 1313 matching lines @@
                 ['include', '^browser/ui/views/bookmarks/bookmark_menu_controller_views.cc'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_menu_delegate.cc'],
                 ['include', '^browser/ui/views/bookmarks/bookmark_menu_delegate.h'],
                 ['include', '^browser/ui/views/browser_actions_container.cc'],
                 ['include', '^browser/ui/views/browser_actions_container.h'],
                 ['include', '^browser/ui/views/chrome_to_mobile_bubble_view.cc'],
                 ['include', '^browser/ui/views/chrome_to_mobile_bubble_view.h'],
                 ['include', '^browser/ui/views/chrome_views_delegate.cc'],
                 ['include', '^browser/ui/views/collected_cookies_views.cc'],
                 ['include', '^browser/ui/views/collected_cookies_views.h'],
+                ['include', '^browser/ui/views/color_chooser_aura.cc'],
                 ['include', '^browser/ui/views/confirm_bubble_view.cc'],
                 ['include', '^browser/ui/views/confirm_bubble_view.h'],
                 ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
                 ['include', '^browser/ui/views/constrained_window_views.cc'],
                 ['include', '^browser/ui/views/content_setting_bubble_contents.cc'],
                 ['include', '^browser/ui/views/content_setting_bubble_contents.h'],
                 ['include', '^browser/ui/views/cookie_info_view.cc'],
                 ['include', '^browser/ui/views/cookie_info_view.h'],
                 ['include', '^browser/ui/views/create_application_shortcut_view.cc'],
                 ['include', '^browser/ui/views/create_application_shortcut_view.h'],
@@ skipping 400 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/chromeos/gdata/gdata.proto' ],
       'variables': {
         'proto_in_dir': 'browser/chromeos/gdata',
         'proto_out_dir': 'chrome/browser/chromeos/gdata',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }