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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 9351004: Reverting Gyp simplifications in chrome/chrome_browser.gypi (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
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 4b97cac15b60e5e8e7a46e68b7a632254c799995..2ac127c2535b9c88d185c3289402fe2d697e3382 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4316,37 +4316,37 @@
['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.h'],
['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
],
- }, { # !chromeos==0
+ }],
+ ['chromeos==1', {
'dependencies': [
- 'browser/chromeos/input_method/input_method.gyp:gencode',
- '../build/linux/system.gyp:dbus',
'../build/linux/system.gyp:dbus-glib',
- '../build/linux/system.gyp:fontconfig',
- '../build/linux/system.gyp:x11',
- '../dbus/dbus.gyp:dbus',
'../third_party/libevent/libevent.gyp:libevent',
'../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp:mozc_candidates_proto',
+ 'browser/chromeos/input_method/input_method.gyp:gencode',
],
- 'sources/': [
- ['exclude', 'browser/extensions/default_apps.cc'],
- ['exclude', 'browser/extensions/default_apps.h'],
- ['exclude', 'browser/first_run/upgrade_util.cc'],
- ['exclude', 'browser/first_run/upgrade_util.h'],
- ['exclude', 'browser/first_run/upgrade_util_linux.cc'],
- ['exclude', 'browser/icon_loader_linux.cc'],
- ['exclude', 'browser/icon_manager_linux.cc'],
- ['exclude', 'browser/idle_linux.cc'],
- ['exclude', 'browser/password_manager/native_backend_gnome_x.cc'],
- ['exclude', 'browser/password_manager/native_backend_gnome_x.h'],
- ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'],
- ['exclude', 'browser/password_manager/native_backend_kwallet_x.h'],
- ['exclude', 'browser/platform_util_linux.cc'],
- ['exclude', 'browser/ui/webui/help/version_updater_unimplemented.cc'],
- ['exclude', 'browser/ui/webui/help/version_updater_unimplemented.h'],
- ['exclude', 'browser/upgrade_detector_impl.cc'],
- ['exclude', 'browser/upgrade_detector_impl.h'],
- ['include', 'browser/chromeos/status/memory_menu_button.cc'],
- ['include', 'browser/chromeos/status/memory_menu_button.h'],
+ 'sources!': [
+ 'browser/background/background_mode_manager_gtk.cc',
+ 'browser/extensions/default_apps.cc',
+ 'browser/extensions/default_apps.h',
+ 'browser/first_run/upgrade_util.cc',
+ 'browser/first_run/upgrade_util.h',
+ 'browser/first_run/upgrade_util_linux.cc',
+ 'browser/icon_loader_linux.cc',
+ 'browser/icon_manager_linux.cc',
+ 'browser/idle_linux.cc',
+ 'browser/password_manager/native_backend_gnome_x.cc',
+ 'browser/password_manager/native_backend_gnome_x.h',
+ 'browser/password_manager/native_backend_kwallet_x.cc',
+ 'browser/password_manager/native_backend_kwallet_x.h',
+ 'browser/platform_util_linux.cc',
+ 'browser/printing/print_dialog_gtk.cc',
+ 'browser/printing/print_dialog_gtk.h',
+ 'browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc',
+ 'browser/ui/gtk/tab_modal_confirm_dialog_gtk.h',
+ 'browser/ui/webui/help/version_updater_unimplemented.cc',
+ 'browser/ui/webui/help/version_updater_unimplemented.h',
+ 'browser/upgrade_detector_impl.cc',
+ 'browser/upgrade_detector_impl.h',
],
}],
['file_manager_extension==0', {
@@ -4381,6 +4381,13 @@
'browser/password_manager/native_backend_gnome_x.h',
],
}],
+ # linux/chromeos only status area button.
+ ['OS=="linux" and use_aura==1', {
+ 'sources/': [
+ ['include', '^browser/chromeos/status/memory_menu_button.cc'],
+ ['include', '^browser/chromeos/status/memory_menu_button.h'],
+ ],
+ }],
['use_aura==1', {
'sources/': [
['exclude', '^browser/aeropeek_manager.cc'],
@@ -4511,6 +4518,14 @@
}],
],
}],
+ ['OS=="linux" and use_aura==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:dbus',
+ '../build/linux/system.gyp:fontconfig',
+ '../build/linux/system.gyp:x11',
+ '../dbus/dbus.gyp:dbus',
+ ],
+ }],
# Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
# native certificate viewers).
['os_posix == 0 or OS == "mac"', {
@@ -5156,6 +5171,27 @@
['exclude', '^browser/ui/views/edit_search_engine_dialog.h'],
],
}],
+ # These GTK files haven't been ported to views, while ChromeOS has
+ # its own separate implementation below. So re-include them only on
+ # non-ChromeOS views Linux builds.
+ ['OS=="linux" and toolkit_views==1 and chromeos==0', {
+ 'sources/': [
+ ['exclude', '^browser/extensions/extension_file_browser_private_api'],
+ ['include', '^browser/ui/gtk/select_file_dialog_impl.cc'],
+ ['include', '^browser/ui/gtk/select_file_dialog_impl.h'],
+ ['include', '^browser/ui/gtk/select_file_dialog_impl_gtk.cc'],
+ ['include', '^browser/ui/gtk/select_file_dialog_impl_kde.cc'],
+ ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.cc'],
+ ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.h'],
+ ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
+ ['include', '^browser/ui/views/notifications/balloon_view.cc'],
+ ['include', '^browser/ui/views/notifications/balloon_view.h'],
+ ['exclude', '^browser/ui/views/keyboard_overlay_delegate.cc'],
+ ['exclude', '^browser/ui/views/keyboard_overlay_delegate.h'],
+ ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.cc'],
+ ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.h'],
+ ],
+ }],
# Exclude extension_input_ui_api that depends on chromeos again
# (Required because of the '^browser/extensions/' include above)
['chromeos == 0 or use_virtual_keyboard == 0', {
@@ -5164,6 +5200,16 @@
['exclude', '^browser/extensions/extension_input_ui_api.h'],
],
}],
+ # Include the chromeos status tray/icon only for non-aura builds.
+ ['OS=="linux" and toolkit_views==1 and chromeos==1 and use_aura==0', {
+ 'sources/': [
+ ['include', '^browser/ui/views/status_icons/status_icon_chromeos.cc'],
+ ['include', '^browser/ui/views/status_icons/status_icon_chromeos.h'],
+ ['include', '^browser/ui/views/status_icons/status_tray_chromeos.cc'],
+ ['include', '^browser/ui/views/status_icons/status_tray_chromeos.h'],
+ ['exclude', '^browser/ui/views/status_icons/status_tray_linux.cc'],
+ ],
+ }],
# Exclude file manager files again
# (Required because of the '^browser/extensions/' include above)
['file_manager_extension==0', {
@@ -5194,6 +5240,30 @@
'browser/ui/toolbar/bookmark_sub_menu_model.cc',
],
}],
+ ['chromeos==1 and use_aura==0', {
+ 'sources/': [
+ ['exclude', '^browser/chromeos/legacy_window_manager/initial_browser_window_observer.cc'],
+ ['exclude', '^browser/chromeos/legacy_window_manager/initial_browser_window_observer.h'],
+ ['exclude', '^browser/chromeos/power/power_button_controller_delegate_chromeos.cc'],
+ ['exclude', '^browser/chromeos/power/power_button_controller_delegate_chromeos.h'],
+ ['exclude', '^browser/chromeos/power/power_button_observer.cc'],
+ ['exclude', '^browser/chromeos/power/power_button_observer.h'],
+ ['exclude', '^browser/chromeos/power/video_property_writer.cc'],
+ ['exclude', '^browser/chromeos/power/video_property_writer.h'],
+ ['exclude', '^browser/download/download_shelf.h'],
+ ['exclude', '^browser/notifications/balloon_collection_impl.cc'],
+ ['exclude', '^browser/notifications/balloon_collection_impl.h'],
+ ['exclude', '^browser/notifications/balloon_collection_views.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'],
+ ['include', '^browser/ui/webui/tab_modal_confirm_dialog_webui.cc'],
+ ['include', '^browser/ui/webui/tab_modal_confirm_dialog_webui.h'],
+ ],
+ }],
['chromeos==1',{
'sources/': [
['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.cc'],
@@ -5268,39 +5338,12 @@
'browser/importer/ie_importer.cc',
],
}],
- # Build ChromeOS.
- ['chromeos==1', {
+ # Must remove GTK files in PureViews case
+ ['use_aura==1 and OS=="linux"', {
'sources/': [
- ['exclude', '^browser/chromeos/frame/browser_view.cc'],
- ['exclude', '^browser/chromeos/frame/browser_view.h'],
- ['exclude', '^browser/chromeos/frame/panel_browser_view.cc'],
- ['exclude', '^browser/chromeos/frame/panel_browser_view.h'],
- ['exclude', '^browser/chromeos/frame/panel_controller.cc'],
- ['exclude', '^browser/chromeos/frame/panel_controller.h'],
- ['exclude', '^browser/chromeos/legacy_window_manager/wm_ipc.cc'],
- ['exclude', '^browser/chromeos/legacy_window_manager/wm_message_listener.cc'],
- ['exclude', '^browser/chromeos/login/background_view.cc'],
- ['exclude', '^browser/chromeos/login/screen_locker_browsertest.cc'],
- ['exclude', '^browser/chromeos/login/shutdown_button.cc'],
- ['exclude', '^browser/chromeos/login/username_view.cc'],
- ['exclude', '^browser/chromeos/login/user_view.cc'],
- ['exclude', '^browser/chromeos/login/views_login_display.cc'],
- ['exclude', '^browser/chromeos/login/views_login_display_host.cc'],
- ['exclude', '^browser/chromeos/login/wizard_in_process_browser_test.cc'],
- ['exclude', '^browser/chromeos/notifications/'],
['exclude', '^browser/google/google_update.cc'],
['exclude', '^browser/google/google_update.h'],
['exclude', '^browser/platform_util_common_linux.cc'],
- ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.cc'],
- ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
- ['include', '^browser/chromeos/notifications/balloon_collection_impl_aura.cc'],
- ['include', '^browser/chromeos/notifications/balloon_collection_impl_aura.h'],
- ['include', '^browser/chromeos/notifications/balloon_view_host.cc'],
- ['include', '^browser/chromeos/notifications/balloon_view_host.h'],
- ['include', '^browser/chromeos/notifications/system_notification.cc'],
- ['include', '^browser/chromeos/notifications/system_notification_factory.cc'],
- ['include', '^browser/chromeos/notifications/system_notification_factory.h'],
- ['include', '^browser/chromeos/notifications/system_notification.h'],
['include', '^browser/ui/views/aura/'],
['include', '^browser/ui/views/bookmarks/bookmark_editor_view.cc'],
['include', '^browser/ui/views/bookmarks/bookmark_editor_view.h'],
@@ -5322,8 +5365,40 @@
['include', '^browser/ui/views/stubs_aura.cc'],
['include', '^browser/ui/views/tabs/tab_drag_controller2.cc'],
['include', '^browser/ui/views/tabs/tab_drag_controller2.h'],
- ['include', '^browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc'],
['include', '^browser/ui/views/unhandled_keyboard_event_handler.cc'],
+ ['include', '^browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc'],
+ ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.cc'],
+ ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
+ ],
+ }],
+ # Build Aura with ChromeOS.
+ ['use_aura==1 and chromeos==1', {
+ 'sources/': [
+ ['exclude', '^browser/chromeos/frame/panel_controller.cc'],
+ ['exclude', '^browser/chromeos/frame/panel_controller.h'],
+ ['exclude', '^browser/chromeos/frame/browser_view.cc'],
+ ['exclude', '^browser/chromeos/frame/browser_view.h'],
+ ['exclude', '^browser/chromeos/frame/panel_browser_view.cc'],
+ ['exclude', '^browser/chromeos/frame/panel_browser_view.h'],
+ ['exclude', '^browser/chromeos/legacy_window_manager/wm_ipc.cc'],
+ ['exclude', '^browser/chromeos/legacy_window_manager/wm_message_listener.cc'],
+ ['exclude', '^browser/chromeos/login/background_view.cc'],
+ ['exclude', '^browser/chromeos/login/screen_locker_browsertest.cc'],
+ ['exclude', '^browser/chromeos/login/shutdown_button.cc'],
+ ['exclude', '^browser/chromeos/login/username_view.cc'],
+ ['exclude', '^browser/chromeos/login/user_view.cc'],
+ ['exclude', '^browser/chromeos/login/views_login_display.cc'],
+ ['exclude', '^browser/chromeos/login/views_login_display_host.cc'],
+ ['exclude', '^browser/chromeos/login/wizard_in_process_browser_test.cc'],
+ ['exclude', '^browser/chromeos/notifications/'],
+ ['include', '^browser/chromeos/notifications/balloon_collection_impl_aura.cc'],
+ ['include', '^browser/chromeos/notifications/balloon_collection_impl_aura.h'],
+ ['include', '^browser/chromeos/notifications/balloon_view_host.cc'],
+ ['include', '^browser/chromeos/notifications/balloon_view_host.h'],
+ ['include', '^browser/chromeos/notifications/system_notification.cc'],
+ ['include', '^browser/chromeos/notifications/system_notification.h'],
+ ['include', '^browser/chromeos/notifications/system_notification_factory.cc'],
+ ['include', '^browser/chromeos/notifications/system_notification_factory.h'],
],
}],
['use_aura==1', {
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698