chrome/chrome_browser.gypi - Issue 8585040: Fix DownloadTests and change cros/aura to use shelf

Unified Diff: chrome/chrome_browser.gypi

Issue 8585040: Fix DownloadTests and change cros/aura to use shelf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review nits Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index a339925a185a4d84492319655dfa1133900abeac..b4139cfa7ba98326e9ac7f161d10b25d5d8af0bc 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -3348,7 +3348,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_win.cc',

+ 'browser/ui/views/download/download_started_animation_views.cc',

'browser/ui/views/dropdown_bar_host.cc',

'browser/ui/views/dropdown_bar_host.h',

'browser/ui/views/dropdown_bar_host_aura.cc',

@@ -4737,6 +4737,7 @@

['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'],

@@ -5052,6 +5053,13 @@

['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',{

@@ -5061,17 +5069,8 @@

['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',

« no previous file with comments | « chrome/browser/ui/views/frame/browser_view_layout.cc ('k') | no next file » | no next file with comments »