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

Side by Side Diff: content/content_renderer.gypi

Issue 201283002: Revert of Adds the ability for the renderer to create the mojo channel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
« no previous file with comments | « content/content_common.gypi ('k') | content/renderer/mojo/mojo_render_process_observer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 '../gin/gin.gyp:gin', 7 '../gin/gin.gyp:gin',
8 '../jingle/jingle.gyp:jingle_glue', 8 '../jingle/jingle.gyp:jingle_glue',
9 '../media/media.gyp:media', 9 '../media/media.gyp:media',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 'renderer/media/webmediasource_impl.cc', 297 'renderer/media/webmediasource_impl.cc',
298 'renderer/media/webmediasource_impl.h', 298 'renderer/media/webmediasource_impl.h',
299 'renderer/media/websourcebuffer_impl.cc', 299 'renderer/media/websourcebuffer_impl.cc',
300 'renderer/media/websourcebuffer_impl.h', 300 'renderer/media/websourcebuffer_impl.h',
301 'renderer/memory_benchmarking_extension.cc', 301 'renderer/memory_benchmarking_extension.cc',
302 'renderer/memory_benchmarking_extension.h', 302 'renderer/memory_benchmarking_extension.h',
303 'renderer/menu_item_builder.cc', 303 'renderer/menu_item_builder.cc',
304 'renderer/menu_item_builder.h', 304 'renderer/menu_item_builder.h',
305 'renderer/mhtml_generator.cc', 305 'renderer/mhtml_generator.cc',
306 'renderer/mhtml_generator.h', 306 'renderer/mhtml_generator.h',
307 'renderer/mojo/mojo_render_process_observer.cc',
308 'renderer/mojo/mojo_render_process_observer.h',
309 'renderer/mouse_lock_dispatcher.cc', 307 'renderer/mouse_lock_dispatcher.cc',
310 'renderer/mouse_lock_dispatcher.h', 308 'renderer/mouse_lock_dispatcher.h',
311 'renderer/notification_provider.cc', 309 'renderer/notification_provider.cc',
312 'renderer/notification_provider.h', 310 'renderer/notification_provider.h',
313 'renderer/npapi/plugin_channel_host.cc', 311 'renderer/npapi/plugin_channel_host.cc',
314 'renderer/npapi/plugin_channel_host.h', 312 'renderer/npapi/plugin_channel_host.h',
315 'renderer/npapi/webplugin_delegate_proxy.cc', 313 'renderer/npapi/webplugin_delegate_proxy.cc',
316 'renderer/npapi/webplugin_delegate_proxy.h', 314 'renderer/npapi/webplugin_delegate_proxy.h',
317 'renderer/npapi/webplugin_impl.cc', 315 'renderer/npapi/webplugin_impl.cc',
318 'renderer/npapi/webplugin_impl.h', 316 'renderer/npapi/webplugin_impl.h',
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 'renderer/webscrollbarbehavior_impl_mac.mm', 568 'renderer/webscrollbarbehavior_impl_mac.mm',
571 'renderer/webscrollbarbehavior_impl_mac.h', 569 'renderer/webscrollbarbehavior_impl_mac.h',
572 ], 570 ],
573 }], 571 }],
574 ['OS=="win" and win_use_allocator_shim==1', { 572 ['OS=="win" and win_use_allocator_shim==1', {
575 'dependencies': [ 573 'dependencies': [
576 '../base/allocator/allocator.gyp:allocator', 574 '../base/allocator/allocator.gyp:allocator',
577 ], 575 ],
578 }], 576 }],
579 # TODO(sky): temporary until mojo runs on mac. 577 # TODO(sky): temporary until mojo runs on mac.
580 ['OS=="mac" or OS=="ios"', { 578 ['OS=="mac"', {
581 'sources!': [ 579 'sources!': [
582 'renderer/mojo/mojo_render_process_observer.cc',
583 'renderer/mojo/mojo_render_process_observer.h',
584 'renderer/web_ui_mojo.cc', 580 'renderer/web_ui_mojo.cc',
585 'renderer/web_ui_mojo.h', 581 'renderer/web_ui_mojo.h',
586 'renderer/web_ui_mojo_context_state.cc', 582 'renderer/web_ui_mojo_context_state.cc',
587 'renderer/web_ui_mojo_context_state.h', 583 'renderer/web_ui_mojo_context_state.h',
588 'renderer/web_ui_runner.cc', 584 'renderer/web_ui_runner.cc',
589 'renderer/web_ui_runner.h', 585 'renderer/web_ui_runner.h',
590 ], 586 ],
591 }, { 587 }, {
592 'dependencies': [ 588 'dependencies': [
593 '../mojo/mojo.gyp:mojo_environment_chromium', 589 '../mojo/mojo.gyp:mojo_environment_chromium',
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 }], 778 }],
783 ], 779 ],
784 'target_conditions': [ 780 'target_conditions': [
785 ['OS=="android"', { 781 ['OS=="android"', {
786 'sources/': [ 782 'sources/': [
787 ['include', '^renderer/render_view_linux\\.cc$'], 783 ['include', '^renderer/render_view_linux\\.cc$'],
788 ], 784 ],
789 }], 785 }],
790 ], 786 ],
791 } 787 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | content/renderer/mojo/mojo_render_process_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698