Revert 110765 - Fix DownloadTests and change cros/aura to use shelf

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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',
       'dependencies': [
@@ skipping 3325 matching lines @@
         'browser/ui/views/dom_view.cc',
         'browser/ui/views/dom_view.h',
         'browser/ui/views/download/download_in_progress_dialog_view.cc',
         'browser/ui/views/download/download_in_progress_dialog_view.h',
         'browser/ui/views/download/download_item_view.cc',
         'browser/ui/views/download/download_item_view.h',
         'browser/ui/views/download/download_shelf_context_menu_view.cc',
         'browser/ui/views/download/download_shelf_context_menu_view.h',
         'browser/ui/views/download/download_shelf_view.cc',
         'browser/ui/views/download/download_shelf_view.h',
-        'browser/ui/views/download/download_started_animation_views.cc',
+        'browser/ui/views/download/download_started_animation_win.cc',
         'browser/ui/views/dropdown_bar_host.cc',
         'browser/ui/views/dropdown_bar_host.h',
         'browser/ui/views/dropdown_bar_host_aura.cc',
         'browser/ui/views/dropdown_bar_host_delegate.h',
         'browser/ui/views/dropdown_bar_host_gtk.cc',
         'browser/ui/views/dropdown_bar_host_win.cc',
         'browser/ui/views/dropdown_bar_view.cc',
         'browser/ui/views/dropdown_bar_view.h',
         'browser/ui/views/edit_search_engine_dialog.cc',
         'browser/ui/views/edit_search_engine_dialog.h',
@@ skipping 1386 matching lines @@
                 ['include', '^browser/ui/views/dom_view.cc'],
                 ['include', '^browser/ui/views/dom_view.h'],
                 ['include', '^browser/ui/views/download/download_in_progress_dialog_view.cc'],
                 ['include', '^browser/ui/views/download/download_in_progress_dialog_view.h'],
                 ['include', '^browser/ui/views/download/download_item_view.cc'],
                 ['include', '^browser/ui/views/download/download_item_view.h'],
                 ['include', '^browser/ui/views/download/download_shelf_context_menu_view.cc'],
                 ['include', '^browser/ui/views/download/download_shelf_context_menu_view.h'],
                 ['include', '^browser/ui/views/download/download_shelf_view.cc'],
                 ['include', '^browser/ui/views/download/download_shelf_view.h'],
-                ['include', '^browser/ui/views/download/download_started_animation_views.cc'],
                 ['include', '^browser/ui/views/dropdown_bar_host.cc'],
                 ['include', '^browser/ui/views/dropdown_bar_host.h'],
                 ['include', '^browser/ui/views/dropdown_bar_host_gtk.cc'],
                 ['include', '^browser/ui/views/dropdown_bar_view.cc'],
                 ['include', '^browser/ui/views/dropdown_bar_view.h'],
                 ['include', '^browser/ui/views/event_utils.cc'],
                 ['include', '^browser/ui/views/event_utils.h'],
                 ['include', '^browser/ui/views/extensions/browser_action_drag_data.cc'],
                 ['include', '^browser/ui/views/extensions/browser_action_drag_data.h'],
                 ['include', '^browser/ui/views/extensions/browser_action_overflow_menu_controller.cc'],
@@ skipping 305 matching lines @@
               ],
             }],
             # chromeos notifications are not used in aura.
             ['chromeos==1 and use_aura==0', {
               'sources/': [
                 ['exclude', '^browser/notifications/balloon_collection_impl.cc'],
                 ['exclude', '^browser/notifications/balloon_collection_impl.h'],
                 ['exclude', '^browser/notifications/balloon_collection_views.cc'],
                 ['exclude', '^chromeos/legacy_window_manager/initial_browser_window_observer.cc'],
                 ['exclude', '^chromeos/legacy_window_manager/initial_browser_window_observer.h'],
-                ['exclude', '^browser/download/download_shelf.h'],
-                ['exclude', '^browser/ui/views/download/download_item_view.cc'],
-                ['exclude', '^browser/ui/views/download/download_item_view.h'],
-                ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.cc'],
-                ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.h'],
-                ['exclude', '^browser/ui/views/download/download_shelf_view.cc'],
-                ['exclude', '^browser/ui/views/download/download_shelf_view.h'],
               ],
             }],
             ['chromeos==1',{
               'sources/': [
                 ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.cc'],
                 ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.h'],
                 ['include', '^browser/ui/gtk/simple_message_box_gtk.cc'],
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'],
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.h'],
+                ['exclude', '^browser/download/download_shelf.h'],
+                ['exclude', '^browser/download/download_shelf_context_menu.cc'],
+                ['exclude', '^browser/download/download_shelf_context_menu.h'],
                 ['exclude', '^browser/extensions/extension_tts_api_linux.cc'],
                 ['exclude', '^browser/notifications/balloon_collection_gtk.cc'],
+                ['exclude', '^browser/ui/views/download/download_item_view.cc'],
+                ['exclude', '^browser/ui/views/download/download_item_view.h'],
+                ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.cc'],
+                ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.h'],
+                ['exclude', '^browser/ui/views/download/download_shelf_view.cc'],
+                ['exclude', '^browser/ui/views/download/download_shelf_view.h'],
               ],
               'dependencies': [
                 '../dbus/dbus.gyp:dbus',
                 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
                 '../third_party/protobuf/protobuf.gyp:protoc#host',
               ],
               'conditions': [
                 ['system_libcros==0', {
                   'dependencies': [
                     '../third_party/cros/cros_api.gyp:cros_api',
@@ skipping 197 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }