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

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: White spaces 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/select_file_dialog.cc ('K') | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.cc ('k') | chrome/common/render_messages.h » ('j') | content/browser/browser_main.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 0b323d478a7ef61d80edc81498edf2ad61a25f9b..9d851374337dc61e7841141b8172e03fce71b40d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1910,8 +1910,7 @@
'browser/renderer_host/render_widget_host_view_mac.mm',
'browser/renderer_host/render_widget_host_view_views.cc',
'browser/renderer_host/render_widget_host_view_views.h',
- 'browser/renderer_host/render_widget_host_view_views_gtk.cc',
- 'browser/renderer_host/render_widget_host_view_views_touch.cc',
+ 'browser/renderer_host/render_widget_host_view_views_touch.cc',
'browser/renderer_host/render_widget_host_view_views_win.cc',
'browser/renderer_host/safe_browsing_resource_handler.cc',
'browser/renderer_host/safe_browsing_resource_handler.h',
@@ -4803,9 +4802,6 @@
['exclude', '^browser/extensions/extension_input_api.h'],
['exclude', '^browser/extensions/key_identifier_conversion_views.cc'],
['exclude', '^browser/extensions/key_identifier_conversion_views.h'],
- ['exclude', '^browser/renderer_host/render_widget_host_view_views_gtk.h'],
- ['exclude', '^browser/renderer_host/render_widget_host_view_views_gtk.cc'],
-
],
}],
# These GTK files haven't been ported to views, while ChromeOS has
@@ -4851,7 +4847,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'],
@@ -4968,6 +4964,55 @@
'browser/importer/ie_importer.cc',
],
}],
+ # Must remove GTK files in PureViews case
+ ['use_aura==1 and OS=="linux"', {
+ 'sources/': [
+ ['exclude', '^browser/automation/testing_automation_provider_gtk.cc'],
+ ['exclude', '^browser/first_run/first_run_gtk.cc'],
+ ['exclude', '^browser/google/google_update.cc'],
+ ['exclude', '^browser/google/google_update.h'],
+ ['exclude', '^browser/platform_util_common_linux.cc'],
+ ['exclude', '^browser/platform_util_linux.cc'],
+ ['exclude', '^browser/printing/print_dialog_gtk.cc'],
+ ['exclude', '^browser/printing/print_dialog_gtk.h'],
+ ['exclude', '^browser/process_singleton_linux.cc'],
+ ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
+ ['exclude', '^browser/renderer_host/render_widget_host_view_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/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/tabs/dock_info_gtk.cc'],
+ ['exclude', '^browser/ui/views/browser_bubble_gtk.cc'],
+ ['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/frame/browser_frame_gtk.cc'],
+ ['exclude', '^browser/ui/views/frame/browser_frame_gtk.h'],
+ ['exclude', '^browser/ui/views/handle_web_keyboard_event_gtk.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_view_gtk.cc'],
+ ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.h'],
+ ['include', '^browser/ui/login/login_prompt_ui.cc'],
+ ['include', '^browser/ui/views/aura/aura_init.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/stubs_aura.cc'],
+ ['include', '^browser/ui/webui/options/certificate_manager_handler.cc'],
+ ],
+ }],
[ 'use_openssl==1', {
'sources!': [
'browser/importer/nss_decryptor.cc',
« chrome/browser/ui/views/select_file_dialog.cc ('K') | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_views.cc ('k') | chrome/common/render_messages.h » ('j') | content/browser/browser_main.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698