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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First version that links (and crashes) Created 9 years, 3 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
« chrome/browser/ui/views/stubs_aura.cc ('K') | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.cc ('k') | chrome/common/render_messages.h » ('j') | content/browser/renderer_host/render_message_filter_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index cb4742f49c25a687e68ec29dd45fdd259085c085..e10388614f4afaa28f691e2e41c0a022f0d471da 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4033,78 +4033,6 @@
],
},
}],
- ['use_aura==0', {
- 'sources/': [
- ['exclude', '^browser/ui/views/aura/*'],
- ],
- }],
- ['use_aura==1', {
- 'sources/': [
- ['exclude', '^browser/aeropeek_manager.cc'],
- ['exclude', '^browser/automation/automation_provider_win.cc'],
- ['exclude', '^browser/automation/chrome_frame_automation_provider.cc'],
- ['exclude', '^browser/automation/chrome_frame_automation_provider.h'],
- ['exclude', '^browser/automation/testing_automation_provider_win.cc'],
- ['exclude', '^browser/google/google_update.cc'],
- ['exclude', '^browser/google/google_update.h'],
- ['exclude', '^browser/external_tab_container_win.cc'],
- ['exclude', '^browser/external_tab_container_win.h'],
- ['exclude', '^browser/first_run/first_run_win.cc'],
- ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'],
- ['exclude', '^browser/first_run/try_chrome_dialog_view.h'],
- ['exclude', '^browser/hang_monitor/'],
- ['exclude', '^browser/platform_util_win.cc'],
- ['exclude', '^browser/process_singleton_win.cc'],
- ['exclude', '^browser/tab_contents/web_drag_source_win.cc'],
- ['exclude', '^browser/tab_contents/web_drag_source_win.h'],
- ['exclude', '^browser/ui/panels/auto_hiding_desktop_bar_win.cc'],
- ['exclude', '^browser/ui/tabs/dock_info_win.cc'],
- ['exclude', '^browser/ui/views/about_ipc_dialog.cc'],
- ['exclude', '^browser/ui/views/app_menu_button_win.cc'],
- ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view.cc'],
- ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view.h'],
- ['exclude', '^browser/ui/views/browser_bubble_win.cc'],
- ['exclude', '^browser/ui/views/bubble/border_widget_win.cc'],
- ['exclude', '^browser/ui/views/bubble/border_widget_win.h'],
- ['exclude', '^browser/ui/views/certificate_viewer_win.cc'],
- ['exclude', '^browser/ui/views/collected_cookies_win.cc'],
- ['exclude', '^browser/ui/views/collected_cookies_win.h'],
- ['exclude', '^browser/ui/views/dropdown_bar_host_win.cc'],
- ['exclude', '^browser/ui/views/external_protocol_dialog.cc'],
- ['exclude', '^browser/ui/views/find_bar_host_win.cc'],
- ['exclude', '^browser/ui/views/first_run_bubble.cc'],
- ['exclude', '^browser/ui/views/frame/browser_frame_win.cc'],
- ['exclude', '^browser/ui/views/frame/browser_frame_win.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/hung_renderer_view.cc'],
- ['exclude', '^browser/ui/views/importer/import_progress_dialog_view.cc'],
- ['exclude', '^browser/ui/views/native_constrained_window_win.cc'],
- ['exclude', '^browser/ui/views/omnibox/omnibox_view_win.cc'],
- ['exclude', '^browser/ui/views/omnibox/omnibox_view_win.h'],
- ['exclude', '^browser/ui/views/shell_dialogs_win.cc'],
- ['exclude', '^browser/ui/views/simple_message_box_win.cc'],
- ['exclude', '^browser/ui/views/ssl_client_certificate_selector.cc'],
- ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_win.cc'],
- ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_win.h'],
- ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_win.cc'],
- ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_win.h'],
- ['exclude', '^browser/ui/views/tab_contents/tab_contents_drag_win.cc'],
- ['exclude', '^browser/ui/views/tab_contents/tab_contents_drag_win.h'],
- ['exclude', '^browser/ui/views/tabs/native_view_photobooth.h'],
- ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.cc'],
- ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.h'],
- ['exclude', '^browser/ui/views/task_manager_view.cc'],
- ['exclude', '^browser/ui/views/task_manager_view.h'],
- ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'],
- ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'],
- ['include', '^browser/ui/views/simple_message_box_views.cc'],
- ['include', '^browser/ui/views/simple_message_box_views.h'],
- ],
- 'dependencies': [
- '../ui/aura/aura.gyp:aura',
- ],
- }],
['webui_dialogs == 1', {
'defines': [
'WEBUI_DIALOGS',
@@ -4837,7 +4765,7 @@
],
}],
# GTK build only
- ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
+ ['toolkit_uses_gtk == 1 and toolkit_views == 0 and use_aura == 0', {
'sources/': [
['include', '^browser/printing/print_dialog_gtk.cc'],
['include', '^browser/printing/print_dialog_gtk.h'],
@@ -4953,6 +4881,126 @@
'browser/importer/ie_importer.cc',
],
}],
+ # Must procees Aura rules after Toolkit and Platform related rules.
+ ['use_aura==0', {
Ben Goodger (Google) 2011/09/16 01:11:18 This is not inside any other conditional now, is i
Emmanuel Saint-loubert-Bié 2011/09/16 02:34:54 Should it? I actually reworked this entire file to
Ben Goodger (Google) 2011/09/16 14:46:55 Nope, just checking!
+ 'sources/': [
+ ['exclude', '^browser/ui/views/aura/*'],
+ ],
+ }],
+ ['use_aura==1', {
+ 'sources/': [
+ ['exclude', '^browser/aeropeek_manager.cc'],
+ ['exclude', '^browser/automation/automation_provider_win.cc'],
+ ['exclude', '^browser/automation/chrome_frame_automation_provider.cc'],
+ ['exclude', '^browser/automation/chrome_frame_automation_provider.h'],
+ ['exclude', '^browser/automation/testing_automation_provider_gtk.cc'],
+ ['exclude', '^browser/automation/testing_automation_provider_win.cc'],
+ ['exclude', '^browser/external_tab_container_win.cc'],
+ ['exclude', '^browser/external_tab_container_win.h'],
+ ['exclude', '^browser/first_run/first_run_gtk.cc'],
+ ['exclude', '^browser/first_run/first_run_win.cc'],
+ ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'],
+ ['exclude', '^browser/first_run/try_chrome_dialog_view.h'],
+ ['exclude', '^browser/google/google_update.cc'],
+ ['exclude', '^browser/google/google_update.h'],
+ ['exclude', '^browser/hang_monitor/'],
+ ['exclude', '^browser/platform_util_common_linux.cc'],
+ ['exclude', '^browser/platform_util_linux.cc'],
+ ['exclude', '^browser/platform_util_win.cc'],
+ ['exclude', '^browser/printing/print_dialog_gtk.cc'],
+ ['exclude', '^browser/printing/print_dialog_gtk.h'],
+ ['exclude', '^browser/process_singleton_linux.cc'],
+ ['exclude', '^browser/process_singleton_win.cc'],
+ ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
+ ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
+ ['exclude', '^browser/renderer_host/render_widget_host_view_views_gtk.cc'],
+ ['exclude', '^browser/renderer_host/render_widget_host_view_views_gtk.h'],
+ ['exclude', '^browser/speech/speech_input_bubble_gtk.cc'],
+ ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.cc'],
+ ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.h'],
+ ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
+ ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
+ ['exclude', '^browser/tab_contents/web_drag_source_win.cc'],
+ ['exclude', '^browser/tab_contents/web_drag_source_win.h'],
+ ['exclude', '^browser/themes/theme_service_gtk.cc'],
+ ['exclude', '^browser/ui/gtk/*'],
+ ['exclude', '^browser/ui/input_window_dialog.h'],
+ ['exclude', '^browser/ui/input_window_dialog_gtk.cc'],
+ ['exclude', '^browser/ui/input_window_dialog_win.cc'],
+ ['exclude', '^browser/ui/login/login_prompt_gtk.cc'],
+ ['exclude', '^browser/ui/panels/auto_hiding_desktop_bar_win.cc'],
+ ['exclude', '^browser/ui/tabs/dock_info_gtk.cc'],
+ ['exclude', '^browser/ui/tabs/dock_info_win.cc'],
+ ['exclude', '^browser/ui/views/about_ipc_dialog.cc'],
+ ['exclude', '^browser/ui/views/app_menu_button_win.cc'],
+ ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view.cc'],
+ ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view.h'],
+ ['exclude', '^browser/ui/views/browser_bubble_gtk.cc'],
+ ['exclude', '^browser/ui/views/browser_bubble_win.cc'],
+ ['exclude', '^browser/ui/views/bubble/border_widget_win.cc'],
+ ['exclude', '^browser/ui/views/bubble/border_widget_win.h'],
+ ['exclude', '^browser/ui/views/certificate_viewer_win.cc'],
+ ['exclude', '^browser/ui/views/collected_cookies_win.cc'],
+ ['exclude', '^browser/ui/views/collected_cookies_win.h'],
+ ['exclude', '^browser/ui/views/constrained_html_delegate_gtk.cc'],
+ ['exclude', '^browser/ui/views/dialog_stubs_gtk.cc'],
+ ['exclude', '^browser/ui/views/dropdown_bar_host_gtk.cc'],
+ ['exclude', '^browser/ui/views/dropdown_bar_host_win.cc'],
+ ['exclude', '^browser/ui/views/external_protocol_dialog.cc'],
+ ['exclude', '^browser/ui/views/find_bar_host_win.cc'],
+ ['exclude', '^browser/ui/views/first_run_bubble.cc'],
+ ['exclude', '^browser/ui/views/frame/browser_frame_gtk.cc'],
+ ['exclude', '^browser/ui/views/frame/browser_frame_gtk.h'],
+ ['exclude', '^browser/ui/views/frame/browser_frame_win.cc'],
+ ['exclude', '^browser/ui/views/frame/browser_frame_win.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/handle_web_keyboard_event_gtk.cc'],
+ ['exclude', '^browser/ui/views/hung_renderer_view.cc'],
+ ['exclude', '^browser/ui/views/importer/import_progress_dialog_view.cc'],
+ ['exclude', '^browser/ui/views/native_constrained_window_win.cc'],
+ ['exclude', '^browser/ui/views/omnibox/omnibox_view_win.cc'],
+ ['exclude', '^browser/ui/views/omnibox/omnibox_view_win.h'],
+ ['exclude', '^browser/ui/views/shell_dialogs_win.cc'],
+ ['exclude', '^browser/ui/views/simple_message_box_win.cc'],
+ ['exclude', '^browser/ui/views/ssl_client_certificate_selector.cc'],
+ ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc'],
+ ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_gtk.h'],
+ ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_win.cc'],
+ ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_win.h'],
+ ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc'],
+ ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.h'],
+ ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_win.cc'],
+ ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_win.h'],
+ ['exclude', '^browser/ui/views/tab_contents/tab_contents_drag_win.cc'],
+ ['exclude', '^browser/ui/views/tab_contents/tab_contents_drag_win.h'],
+ ['exclude', '^browser/ui/views/tabs/native_view_photobooth.h'],
+ ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.cc'],
+ ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.h'],
+ ['exclude', '^browser/ui/views/task_manager_view.cc'],
+ ['exclude', '^browser/ui/views/task_manager_view.h'],
+ ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'],
+ ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'],
+ ['include', '^browser/ui/gtk/gtk_util.cc'],
+ ['include', '^browser/ui/gtk/gtk_util.h'],
+ ['include', '^browser/ui/login/login_prompt_ui.cc'],
+ ['include', '^browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc'],
+ ['include', '^browser/ui/views/browser_bubble_aura.cc'],
+ ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
+ ['include', '^browser/ui/views/dropdown_bar_host_aura.cc'],
+ ['include', '^browser/ui/views/frame/browser_frame_aura.cc'],
+ ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
+ ['include', '^browser/ui/views/select_file_dialog.cc'],
+ ['include', '^browser/ui/views/simple_message_box_views.cc'],
+ ['include', '^browser/ui/views/simple_message_box_views.h'],
+ ['include', '^browser/ui/views/stubs_aura.cc'],
+ ['include', '^browser/ui/webui/options/certificate_manager_handler.cc'],
+ ],
+ 'dependencies': [
+ '../ui/aura/aura.gyp:aura',
+ ],
+ }],
+ # OpenSSL.
[ 'use_openssl==1', {
'sources!': [
'browser/importer/nss_decryptor.cc',
« chrome/browser/ui/views/stubs_aura.cc ('K') | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.cc ('k') | chrome/common/render_messages.h » ('j') | content/browser/renderer_host/render_message_filter_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698