Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/chrome/chrome_browser_ui.gypi

 # Copyright 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_ui',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 340 matching lines @@
         'browser/ui/ash/multi_user/multi_user_window_manager_stub.cc',
         'browser/ui/ash/multi_user/multi_user_window_manager_stub.h',
         'browser/ui/ash/multi_user/user_switch_animator_chromeos.cc',
         'browser/ui/ash/multi_user/user_switch_animator_chromeos.h',
         'browser/ui/ash/screenshot_taker.cc',
         'browser/ui/ash/screenshot_taker.h',
         'browser/ui/ash/session_state_delegate_chromeos.cc',
         'browser/ui/ash/session_state_delegate_chromeos.h',
         'browser/ui/ash/session_state_delegate_views.cc',
         'browser/ui/ash/session_state_delegate_views.h',
-        'browser/ui/ash/solid_color_user_wallpaper_delegate.cc',
-        'browser/ui/ash/solid_color_user_wallpaper_delegate.h',
         'browser/ui/ash/stub_user_accounts_delegate.cc',
         'browser/ui/ash/stub_user_accounts_delegate.h',
         'browser/ui/ash/system_tray_delegate_chromeos.cc',
         'browser/ui/ash/system_tray_delegate_chromeos.h',
         'browser/ui/ash/system_tray_delegate_win.cc',
         'browser/ui/ash/system_tray_delegate_win.h',
         'browser/ui/ash/user_accounts_delegate_chromeos.cc',
         'browser/ui/ash/user_accounts_delegate_chromeos.h',
+        'browser/ui/ash/user_wallpaper_delegate_win.cc',
+        'browser/ui/ash/user_wallpaper_delegate_win.h',
         'browser/ui/ash/volume_controller_chromeos.cc',
         'browser/ui/ash/volume_controller_chromeos.h',
         'browser/ui/aura/active_desktop_monitor.cc',
         'browser/ui/aura/active_desktop_monitor.h',
         'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc',
         'browser/ui/aura/chrome_browser_main_extra_parts_aura.h',
         'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
         'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
         'browser/ui/autofill/account_chooser_model.cc',
         'browser/ui/autofill/account_chooser_model.h',
@@ skipping 1523 matching lines @@
         'browser/ui/views/tabs/tab_drag_controller.h',
         'browser/ui/views/tabs/tab_strip.cc',
         'browser/ui/views/tabs/tab_strip.h',
         'browser/ui/views/tabs/tab_strip_controller.h',
         'browser/ui/views/tabs/window_finder.h',
         'browser/ui/views/tabs/window_finder_ash.cc',
         'browser/ui/views/tabs/window_finder_chromeos.cc',
         'browser/ui/views/tabs/window_finder_win.cc',
         'browser/ui/views/tabs/window_finder_x11.cc',
         'browser/ui/views/task_manager_view.cc',
+        'browser/ui/views/theme_image_mapper.cc',
         'browser/ui/views/theme_image_mapper.h',
-        'browser/ui/views/theme_image_mapper_chromeos.cc',
-        'browser/ui/views/theme_image_mapper_desktop.cc',
+        'browser/ui/views/theme_image_mapper_aura_win.cc',
         'browser/ui/views/toolbar/back_button.cc',
         'browser/ui/views/toolbar/back_button.h',
         'browser/ui/views/toolbar/browser_action_test_util_views.cc',
         'browser/ui/views/toolbar/browser_action_view.cc',
         'browser/ui/views/toolbar/browser_action_view.h',
         'browser/ui/views/toolbar/browser_actions_container.cc',
         'browser/ui/views/toolbar/browser_actions_container.h',
         'browser/ui/views/toolbar/browser_actions_container_observer.h',
         'browser/ui/views/toolbar/home_button.cc',
         'browser/ui/views/toolbar/home_button.h',
@@ skipping 733 matching lines @@
         ['toolkit_views==0 or chromeos==1', {
           'sources!': [
             'browser/ui/views/message_center/message_center_frame_view.cc',
             'browser/ui/views/message_center/message_center_frame_view.h',
             'browser/ui/views/message_center/message_center_widget_delegate.h',
             'browser/ui/views/message_center/message_center_widget_delegate.cc',
             'browser/ui/views/message_center/web_notification_tray.h',
             'browser/ui/views/message_center/web_notification_tray.cc',
           ],
         }],
-        ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
+        ['use_aura==1 and use_ash==0 and use_ozone==0 and OS=="linux"', {
           'dependencies': [
             # gtk2 is the only component that can interact with gtk2 in our new
             # world.
             'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
             '../build/linux/system.gyp:gio',
           ],
         }],
         ['use_aura==0 or chromeos==1 or OS!="linux"', {
           'sources!': [
             'browser/ui/views/first_run_dialog.cc',
@@ skipping 20 matching lines @@
             '../ash/ash.gyp:ash_resources',
             '../ui/aura/aura.gyp:aura',
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_resources',
             '../ui/wm/wm.gyp:wm',
           ],
           'conditions': [
             ['OS=="win"', {
               'sources/': [
                 ['exclude', '^browser/ui/views/apps/chrome_app_window_delegate_views.cc'],
+                ['exclude', '^browser/ui/views/theme_image_mapper.cc'],
                 ['exclude', '^browser/ui/webui/certificate_viewer_webui.cc'],
                 ['exclude', '^browser/ui/webui/certificate_viewer_webui.h'],
                 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
                 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
                 ['include', 'browser/ui/browser_win.cc'],
               ],
             }, {
               'sources/': [
                 ['exclude', '^browser/ui/views/color_chooser_dialog.cc'],
                 ['exclude', '^browser/ui/views/color_chooser_dialog.h'],
                 ['exclude', '^browser/ui/views/frame/glass_browser_frame_view.cc'],
                 ['exclude', '^browser/ui/views/frame/glass_browser_frame_view.h'],
                 ['exclude', '^browser/ui/views/hwnd_util.h'],
               ],
             }],
           ],
         }, { # else: use_aura==0
           'sources!': [
             'browser/ui/tabs/tab_strip_layout_type.h',
             'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
             'browser/ui/tabs/tab_strip_layout_type_prefs.h',
           ],
           'sources/': [
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host.h'],
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.cc'],
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.h'],
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc'],
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.h'],
+            ['exclude', '^browser/ui/views/theme_image_mapper_aura_win.cc'],
             ['exclude', '^browser/ui/webui/gesture_config_ui.cc'],
             ['exclude', '^browser/ui/webui/gesture_config_ui.h'],
             ['exclude', '^browser/ui/webui/salsa_ui.cc'],
             ['exclude', '^browser/ui/webui/salsa_ui.h'],
           ],
         }],
         ['ui_compositor_image_transport==1', {
           'dependencies': [
             '../ui/gl/gl.gyp:gl',
           ],
@@ skipping 392 matching lines @@
           ],
           'sources!': [
             'browser/ui/views/session_crashed_bubble_view.cc',
             'browser/ui/views/session_crashed_bubble_view.h',
           ],
         }],
       ],
     },
   ],
 }