Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4710)

Unified Diff: chrome/chrome_browser.gypi

Issue 9478015: Aura: Build on the linux desktop, plus add USE_ASH. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try to minimize shell.h change Created 8 years, 10 months 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 5cbcdc6e6423ab7689d52d8d1acfe29b4c492991..245f35a55b55e2a5f8d8782c29ce4c959d508445 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -5415,8 +5415,6 @@
['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/confirm_bubble_view.cc'],
- ['include', '^browser/ui/views/confirm_bubble_view.h'],
['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'],
['include', '^browser/ui/views/omnibox/omnibox_view_views.h'],
['exclude', '^browser/extensions/extension_tts_api_linux.cc'],
@@ -5471,6 +5469,8 @@
['include', '^browser/ui/views/bookmarks/bookmark_editor_view.h'],
['include', '^browser/ui/views/collected_cookies_views.cc'],
['include', '^browser/ui/views/collected_cookies_views.h'],
+ ['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/cookie_info_view.cc'],
@@ -5521,6 +5521,12 @@
['include', '^browser/chromeos/notifications/system_notification_factory.h'],
],
}],
+ # Build Aura on desktop linux
+ ['use_aura==1 and OS=="linux" and chromeos==0', {
+ 'sources/': [
+ ['include', '^browser/ui/views/select_file_dialog_aura.cc'],
+ ],
+ }],
['use_aura==1', {
'sources/': [
['include', '^browser/ui/views/tab_modal_confirm_dialog_views.cc'],

Powered by Google App Engine
This is Rietveld 408576698