diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 22:10:57 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 22:10:57 +0000 |
| commit | 9c16893fff7977bf7e1b87e9a7ac71c9a59f38d7 (patch) | |
| tree | 19f63c865f4f14ea8e333ce2c8aa8a5132a7b1f4 /chrome/chrome_browser.gypi | |
| parent | 9fc2248c79e2e46e8d0632c954469cdcd9fcf6fd (diff) | |
| download | chromium_src-9c16893fff7977bf7e1b87e9a7ac71c9a59f38d7.zip chromium_src-9c16893fff7977bf7e1b87e9a7ac71c9a59f38d7.tar.gz chromium_src-9c16893fff7977bf7e1b87e9a7ac71c9a59f38d7.tar.bz2 | |
Revert 110765 - Fix DownloadTests and change cros/aura to use shelf
BUG=103488
TEST=DownloadTests.* browser tests
Review URL: http://codereview.chromium.org/8585040
TBR=davemoore@chromium.org
Review URL: http://codereview.chromium.org/8569015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 45279ac..cecdaa5 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3343,7 +3343,7 @@ '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', @@ -4750,7 +4750,6 @@ ['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'], @@ -5076,13 +5075,6 @@ ['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',{ @@ -5092,8 +5084,17 @@ ['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', |