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

Side by Side Diff: content/content_browser.gypi

Issue 10689108: Aura: Have ui::Layer implement WebKit::WebExternalTextureLayerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address reviewer comments, remove dead code, plumb through context. Created 8 years, 5 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 'browser/debugger/devtools_resources.gyp:devtools_resources', 7 'browser/debugger/devtools_resources.gyp:devtools_resources',
8 'browser/speech/proto/speech_proto.gyp:speech_proto', 8 'browser/speech/proto/speech_proto.gyp:speech_proto',
9 '../base/base.gyp:base_static', 9 '../base/base.gyp:base_static',
10 '../crypto/crypto.gyp:crypto', 10 '../crypto/crypto.gyp:crypto',
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 'browser/renderer_host/gamepad_browser_message_filter.cc', 503 'browser/renderer_host/gamepad_browser_message_filter.cc',
504 'browser/renderer_host/gamepad_browser_message_filter.h', 504 'browser/renderer_host/gamepad_browser_message_filter.h',
505 'browser/renderer_host/gpu_message_filter.cc', 505 'browser/renderer_host/gpu_message_filter.cc',
506 'browser/renderer_host/gpu_message_filter.h', 506 'browser/renderer_host/gpu_message_filter.h',
507 'browser/renderer_host/gtk_im_context_wrapper.cc', 507 'browser/renderer_host/gtk_im_context_wrapper.cc',
508 'browser/renderer_host/gtk_im_context_wrapper.h', 508 'browser/renderer_host/gtk_im_context_wrapper.h',
509 'browser/renderer_host/gtk_key_bindings_handler.cc', 509 'browser/renderer_host/gtk_key_bindings_handler.cc',
510 'browser/renderer_host/gtk_key_bindings_handler.h', 510 'browser/renderer_host/gtk_key_bindings_handler.h',
511 'browser/renderer_host/gtk_window_utils.cc', 511 'browser/renderer_host/gtk_window_utils.cc',
512 'browser/renderer_host/gtk_window_utils.h', 512 'browser/renderer_host/gtk_window_utils.h',
513 'browser/renderer_host/image_transport_client.cc',
514 'browser/renderer_host/image_transport_client.h',
515 'browser/renderer_host/image_transport_client_linux.cc',
516 'browser/renderer_host/image_transport_factory.cc', 513 'browser/renderer_host/image_transport_factory.cc',
517 'browser/renderer_host/image_transport_factory.h', 514 'browser/renderer_host/image_transport_factory.h',
518 'browser/renderer_host/java/java_bound_object.cc', 515 'browser/renderer_host/java/java_bound_object.cc',
519 'browser/renderer_host/java/java_bound_object.h', 516 'browser/renderer_host/java/java_bound_object.h',
520 'browser/renderer_host/java/java_bridge_channel_host.cc', 517 'browser/renderer_host/java/java_bridge_channel_host.cc',
521 'browser/renderer_host/java/java_bridge_channel_host.h', 518 'browser/renderer_host/java/java_bridge_channel_host.h',
522 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc', 519 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc',
523 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.h', 520 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.h',
524 'browser/renderer_host/java/java_bridge_dispatcher_host.cc', 521 'browser/renderer_host/java/java_bridge_dispatcher_host.cc',
525 'browser/renderer_host/java/java_bridge_dispatcher_host.h', 522 'browser/renderer_host/java/java_bridge_dispatcher_host.h',
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 '../ui/gl/gl.gyp:gl', 954 '../ui/gl/gl.gyp:gl',
958 ], 955 ],
959 'link_settings': { 956 'link_settings': {
960 'libraries': [ 957 'libraries': [
961 '-lXcomposite', 958 '-lXcomposite',
962 ], 959 ],
963 }, 960 },
964 'include_dirs': [ 961 'include_dirs': [
965 '../third_party/angle/include', 962 '../third_party/angle/include',
966 ], 963 ],
967 }, {
968 'sources/': [
969 ['exclude', '^browser/renderer_host/image_transport_client_linux.cc'],
970 ],
971 }], 964 }],
972 ['java_bridge==1', { 965 ['java_bridge==1', {
973 'defines': [ 966 'defines': [
974 'ENABLE_JAVA_BRIDGE', 967 'ENABLE_JAVA_BRIDGE',
975 ], 968 ],
976 }, { 969 }, {
977 'sources/': [ 970 'sources/': [
978 ['exclude', '^browser/renderer_host/java/'], 971 ['exclude', '^browser/renderer_host/java/'],
979 ], 972 ],
980 }], 973 }],
981 ['input_speech==0', { 974 ['input_speech==0', {
982 'sources/': [ 975 'sources/': [
983 ['exclude', '^browser/speech/'], 976 ['exclude', '^browser/speech/'],
984 ], 977 ],
985 }], 978 }],
986 ], 979 ],
987 } 980 }
988 981
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698