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

Side by Side Diff: content/content_browser.gypi

Issue 137403005: Remove some code inside USE_AURA and OS_WIN ifdefs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base_static', 7 '../base/base.gyp:base_static',
8 '../crypto/crypto.gyp:crypto', 8 '../crypto/crypto.gyp:crypto',
9 '../google_apis/google_apis.gyp:google_apis', 9 '../google_apis/google_apis.gyp:google_apis',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 'browser/renderer_host/render_widget_host_view_base.cc', 1054 'browser/renderer_host/render_widget_host_view_base.cc',
1055 'browser/renderer_host/render_widget_host_view_base.h', 1055 'browser/renderer_host/render_widget_host_view_base.h',
1056 'browser/renderer_host/render_widget_host_view_gtk.cc', 1056 'browser/renderer_host/render_widget_host_view_gtk.cc',
1057 'browser/renderer_host/render_widget_host_view_gtk.h', 1057 'browser/renderer_host/render_widget_host_view_gtk.h',
1058 'browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h', 1058 'browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h',
1059 'browser/renderer_host/render_widget_host_view_mac_dictionary_helper.mm', 1059 'browser/renderer_host/render_widget_host_view_mac_dictionary_helper.mm',
1060 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h', 1060 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h',
1061 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm', 1061 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm',
1062 'browser/renderer_host/render_widget_host_view_mac.h', 1062 'browser/renderer_host/render_widget_host_view_mac.h',
1063 'browser/renderer_host/render_widget_host_view_mac.mm', 1063 'browser/renderer_host/render_widget_host_view_mac.mm',
1064 'browser/renderer_host/render_widget_host_view_win.cc',
1065 'browser/renderer_host/render_widget_host_view_win.h',
1066 'browser/renderer_host/renderer_frame_manager.cc', 1064 'browser/renderer_host/renderer_frame_manager.cc',
1067 'browser/renderer_host/renderer_frame_manager.h', 1065 'browser/renderer_host/renderer_frame_manager.h',
1068 'browser/renderer_host/software_frame_manager.cc', 1066 'browser/renderer_host/software_frame_manager.cc',
1069 'browser/renderer_host/software_frame_manager.h', 1067 'browser/renderer_host/software_frame_manager.h',
1070 'browser/renderer_host/socket_stream_dispatcher_host.cc', 1068 'browser/renderer_host/socket_stream_dispatcher_host.cc',
1071 'browser/renderer_host/socket_stream_dispatcher_host.h', 1069 'browser/renderer_host/socket_stream_dispatcher_host.h',
1072 'browser/renderer_host/socket_stream_host.cc', 1070 'browser/renderer_host/socket_stream_host.cc',
1073 'browser/renderer_host/socket_stream_host.h', 1071 'browser/renderer_host/socket_stream_host.h',
1074 'browser/renderer_host/text_input_client_mac.h', 1072 'browser/renderer_host/text_input_client_mac.h',
1075 'browser/renderer_host/text_input_client_mac.mm', 1073 'browser/renderer_host/text_input_client_mac.mm',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 'browser/web_contents/aura/shadow_layer_delegate.cc', 1209 'browser/web_contents/aura/shadow_layer_delegate.cc',
1212 'browser/web_contents/aura/shadow_layer_delegate.h', 1210 'browser/web_contents/aura/shadow_layer_delegate.h',
1213 'browser/web_contents/aura/window_slider.cc', 1211 'browser/web_contents/aura/window_slider.cc',
1214 'browser/web_contents/aura/window_slider.h', 1212 'browser/web_contents/aura/window_slider.h',
1215 'browser/web_contents/drag_utils_gtk.cc', 1213 'browser/web_contents/drag_utils_gtk.cc',
1216 'browser/web_contents/drag_utils_gtk.h', 1214 'browser/web_contents/drag_utils_gtk.h',
1217 'browser/web_contents/touch_editable_impl_aura.cc', 1215 'browser/web_contents/touch_editable_impl_aura.cc',
1218 'browser/web_contents/touch_editable_impl_aura.h', 1216 'browser/web_contents/touch_editable_impl_aura.h',
1219 'browser/web_contents/web_contents_android.cc', 1217 'browser/web_contents/web_contents_android.cc',
1220 'browser/web_contents/web_contents_android.h', 1218 'browser/web_contents/web_contents_android.h',
1221 'browser/web_contents/web_contents_drag_win.cc',
1222 'browser/web_contents/web_contents_drag_win.h',
1223 'browser/web_contents/web_contents_impl.cc', 1219 'browser/web_contents/web_contents_impl.cc',
1224 'browser/web_contents/web_contents_impl.h', 1220 'browser/web_contents/web_contents_impl.h',
1225 'browser/web_contents/web_contents_view_android.cc', 1221 'browser/web_contents/web_contents_view_android.cc',
1226 'browser/web_contents/web_contents_view_android.h', 1222 'browser/web_contents/web_contents_view_android.h',
1227 'browser/web_contents/web_contents_view_aura.cc', 1223 'browser/web_contents/web_contents_view_aura.cc',
1228 'browser/web_contents/web_contents_view_aura.h', 1224 'browser/web_contents/web_contents_view_aura.h',
1229 'browser/web_contents/web_contents_view_gtk.cc', 1225 'browser/web_contents/web_contents_view_gtk.cc',
1230 'browser/web_contents/web_contents_view_gtk.h', 1226 'browser/web_contents/web_contents_view_gtk.h',
1231 'browser/web_contents/web_contents_view_guest.cc', 1227 'browser/web_contents/web_contents_view_guest.cc',
1232 'browser/web_contents/web_contents_view_guest.h', 1228 'browser/web_contents/web_contents_view_guest.h',
1233 'browser/web_contents/web_contents_view_mac.h', 1229 'browser/web_contents/web_contents_view_mac.h',
1234 'browser/web_contents/web_contents_view_mac.mm', 1230 'browser/web_contents/web_contents_view_mac.mm',
1235 'browser/web_contents/web_contents_view_win.cc',
1236 'browser/web_contents/web_contents_view_win.h',
1237 'browser/web_contents/web_drag_dest_gtk.cc', 1231 'browser/web_contents/web_drag_dest_gtk.cc',
1238 'browser/web_contents/web_drag_dest_gtk.h', 1232 'browser/web_contents/web_drag_dest_gtk.h',
1239 'browser/web_contents/web_drag_dest_mac.h', 1233 'browser/web_contents/web_drag_dest_mac.h',
1240 'browser/web_contents/web_drag_dest_mac.mm', 1234 'browser/web_contents/web_drag_dest_mac.mm',
1241 'browser/web_contents/web_drag_dest_win.cc',
1242 'browser/web_contents/web_drag_dest_win.h',
1243 'browser/web_contents/web_drag_source_gtk.cc', 1235 'browser/web_contents/web_drag_source_gtk.cc',
1244 'browser/web_contents/web_drag_source_gtk.h', 1236 'browser/web_contents/web_drag_source_gtk.h',
1245 'browser/web_contents/web_drag_source_mac.h', 1237 'browser/web_contents/web_drag_source_mac.h',
1246 'browser/web_contents/web_drag_source_mac.mm', 1238 'browser/web_contents/web_drag_source_mac.mm',
1247 'browser/web_contents/web_drag_source_win.cc',
1248 'browser/web_contents/web_drag_source_win.h',
1249 'browser/web_contents/web_drag_utils_win.cc', 1239 'browser/web_contents/web_drag_utils_win.cc',
1250 'browser/web_contents/web_drag_utils_win.h', 1240 'browser/web_contents/web_drag_utils_win.h',
1251 'browser/webui/content_web_ui_controller_factory.cc', 1241 'browser/webui/content_web_ui_controller_factory.cc',
1252 'browser/webui/content_web_ui_controller_factory.h', 1242 'browser/webui/content_web_ui_controller_factory.h',
1253 'browser/webui/generic_handler.cc', 1243 'browser/webui/generic_handler.cc',
1254 'browser/webui/generic_handler.h', 1244 'browser/webui/generic_handler.h',
1255 'browser/webui/shared_resources_data_source.cc', 1245 'browser/webui/shared_resources_data_source.cc',
1256 'browser/webui/shared_resources_data_source.h', 1246 'browser/webui/shared_resources_data_source.h',
1257 'browser/webui/url_data_manager.cc', 1247 'browser/webui/url_data_manager.cc',
1258 'browser/webui/url_data_manager.h', 1248 'browser/webui/url_data_manager.h',
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1550 'browser/power_save_blocker_x11.cc', 1540 'browser/power_save_blocker_x11.cc',
1551 'browser/renderer_host/gtk_key_bindings_handler.cc', 1541 'browser/renderer_host/gtk_key_bindings_handler.cc',
1552 'browser/renderer_host/gtk_key_bindings_handler.h', 1542 'browser/renderer_host/gtk_key_bindings_handler.h',
1553 ], 1543 ],
1554 }], 1544 }],
1555 ['os_bsd==1', { 1545 ['os_bsd==1', {
1556 'sources/': [ 1546 'sources/': [
1557 ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$' ], 1547 ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$' ],
1558 ], 1548 ],
1559 }], 1549 }],
1560 ['use_aura!=1 and OS!="win"', { 1550 ['use_aura!=1 and OS!="android"', {
1561 'sources!': [
1562 'browser/renderer_host/ui_events_helper.cc',
1563 'browser/renderer_host/ui_events_helper.h',
1564 ],
1565 }],
1566 ['use_aura!=1 and OS!="win" and OS!="android"', {
1567 'sources!': [ 1551 'sources!': [
1568 'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc', 1552 'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc',
1569 'browser/renderer_host/tap_suppression_controller.cc', 1553 'browser/renderer_host/tap_suppression_controller.cc',
1570 ], 1554 ],
1571 }, { 1555 }, {
1572 'sources!': [ 1556 'sources!': [
1573 'browser/renderer_host/input/touchscreen_tap_suppression_controller_stub .cc', 1557 'browser/renderer_host/input/touchscreen_tap_suppression_controller_stub .cc',
1574 ], 1558 ],
1575 }], 1559 }],
1576 ['use_aura==1', { 1560 ['use_aura==1', {
1577 'dependencies': [ 1561 'dependencies': [
1578 '../ui/aura/aura.gyp:aura', 1562 '../ui/aura/aura.gyp:aura',
1579 '../ui/base/strings/ui_strings.gyp:ui_strings', 1563 '../ui/base/strings/ui_strings.gyp:ui_strings',
1580 '../ui/compositor/compositor.gyp:compositor', 1564 '../ui/compositor/compositor.gyp:compositor',
1581 ], 1565 ],
1582 'sources/': [ 1566 'sources/': [
1583 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'], 1567 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
1584 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'], 1568 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
1585 ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_contr oller.cc'], 1569 ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_contr oller.cc'],
1586 ['exclude', '^browser/renderer_host/native_web_keyboard_event_win.cc'], 1570 ['exclude', '^browser/renderer_host/native_web_keyboard_event_win.cc'],
1587 ['exclude', '^browser/renderer_host/render_widget_host.h'],
1588 ['exclude', '^browser/renderer_host/render_widget_host_view_win.cc'],
1589 ['exclude', '^browser/renderer_host/render_widget_host_view_win.h'],
1590 ['exclude', '^browser/web_contents/web_contents_drag_win.cc'],
1591 ['exclude', '^browser/web_contents/web_contents_drag_win.h'],
1592 ['exclude', '^browser/web_contents/web_contents_view_win.cc'],
1593 ['exclude', '^browser/web_contents/web_contents_view_win.h'],
1594 ['exclude', '^browser/web_contents/web_drag_dest_win.cc'],
1595 ['exclude', '^browser/web_contents/web_drag_dest_win.h'],
1596 ['exclude', '^browser/web_contents/web_drag_source_win.cc'],
1597 ['exclude', '^browser/web_contents/web_drag_source_win.h'],
1598 ], 1571 ],
1599 }, { 1572 }, {
1600 'sources/': [ 1573 'sources/': [
1601 ['exclude', '^browser/aura/'], 1574 ['exclude', '^browser/aura/'],
1602 ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_contr oller_aura.cc'], 1575 ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_contr oller_aura.cc'],
1603 ['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'], 1576 ['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'],
1604 ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'], 1577 ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'],
1605 ['exclude', '^browser/web_contents/touch_editable_impl_aura.cc'], 1578 ['exclude', '^browser/web_contents/touch_editable_impl_aura.cc'],
1606 ['exclude', '^browser/web_contents/touch_editable_impl_aura.h'], 1579 ['exclude', '^browser/web_contents/touch_editable_impl_aura.h'],
1580 ['exclude', '^browser/renderer_host/ui_events_helper.cc'],
1581 ['exclude', '^browser/renderer_host/ui_events_helper.h'],
1607 ], 1582 ],
1608 }], 1583 }],
1609 ['enable_plugins==1', { 1584 ['enable_plugins==1', {
1610 'dependencies': [ 1585 'dependencies': [
1611 '../ppapi/ppapi_internal.gyp:ppapi_ipc', 1586 '../ppapi/ppapi_internal.gyp:ppapi_ipc',
1612 '../ppapi/ppapi_internal.gyp:ppapi_shared', 1587 '../ppapi/ppapi_internal.gyp:ppapi_shared',
1613 ], 1588 ],
1614 }, { # enable_plugins==0 1589 }, { # enable_plugins==0
1615 'sources!': [ 1590 'sources!': [
1616 'browser/pepper_flash_settings_helper_impl.cc', 1591 'browser/pepper_flash_settings_helper_impl.cc',
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 '../build/linux/system.gyp:dbus', 1628 '../build/linux/system.gyp:dbus',
1654 '../dbus/dbus.gyp:dbus', 1629 '../dbus/dbus.gyp:dbus',
1655 ], 1630 ],
1656 }, { # OS != "linux" or use_dbus==0 1631 }, { # OS != "linux" or use_dbus==0
1657 'sources!': [ 1632 'sources!': [
1658 'browser/geolocation/wifi_data_provider_linux.cc', 1633 'browser/geolocation/wifi_data_provider_linux.cc',
1659 ], 1634 ],
1660 }], 1635 }],
1661 ], 1636 ],
1662 } 1637 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698