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

Side by Side Diff: content/content_renderer.gypi

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk Created 6 years, 8 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/content_resources.grd » ('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 'content_common_mojo_bindings',
7 '../gin/gin.gyp:gin', 8 '../gin/gin.gyp:gin',
8 '../jingle/jingle.gyp:jingle_glue', 9 '../jingle/jingle.gyp:jingle_glue',
9 '../media/media.gyp:media', 10 '../media/media.gyp:media',
11 '../mojo/mojo.gyp:mojo_environment_chromium',
12 '../mojo/mojo.gyp:mojo_js_bindings_lib',
10 '../net/net.gyp:net', 13 '../net/net.gyp:net',
11 '../skia/skia.gyp:skia', 14 '../skia/skia.gyp:skia',
12 '../third_party/WebKit/public/blink.gyp:blink', 15 '../third_party/WebKit/public/blink.gyp:blink',
13 '../third_party/icu/icu.gyp:icui18n', 16 '../third_party/icu/icu.gyp:icui18n',
14 '../third_party/icu/icu.gyp:icuuc', 17 '../third_party/icu/icu.gyp:icuuc',
15 '../third_party/libjingle/libjingle.gyp:libjingle', 18 '../third_party/libjingle/libjingle.gyp:libjingle',
16 '../third_party/npapi/npapi.gyp:npapi', 19 '../third_party/npapi/npapi.gyp:npapi',
17 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 20 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
18 '../ui/accessibility/accessibility.gyp:accessibility', 21 '../ui/accessibility/accessibility.gyp:accessibility',
19 '../ui/events/events.gyp:dom4_keycode_converter', 22 '../ui/events/events.gyp:dom4_keycode_converter',
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 'sources!': [ 576 'sources!': [
574 'renderer/webscrollbarbehavior_impl_mac.mm', 577 'renderer/webscrollbarbehavior_impl_mac.mm',
575 'renderer/webscrollbarbehavior_impl_mac.h', 578 'renderer/webscrollbarbehavior_impl_mac.h',
576 ], 579 ],
577 }], 580 }],
578 ['OS=="win" and win_use_allocator_shim==1', { 581 ['OS=="win" and win_use_allocator_shim==1', {
579 'dependencies': [ 582 'dependencies': [
580 '../base/allocator/allocator.gyp:allocator', 583 '../base/allocator/allocator.gyp:allocator',
581 ], 584 ],
582 }], 585 }],
583 ['use_mojo==0', {
584 'sources!': [
585 'renderer/mojo/mojo_render_process_observer.cc',
586 'renderer/mojo/mojo_render_process_observer.h',
587 'renderer/web_ui_mojo.cc',
588 'renderer/web_ui_mojo.h',
589 'renderer/web_ui_mojo_context_state.cc',
590 'renderer/web_ui_mojo_context_state.h',
591 'renderer/web_ui_runner.cc',
592 'renderer/web_ui_runner.h',
593 ],
594 }, {
595 'dependencies': [
596 'content_common_mojo_bindings',
597 '../mojo/mojo.gyp:mojo_environment_chromium',
598 '../mojo/mojo.gyp:mojo_js_bindings_lib',
599 ],
600 }],
601 ['OS=="android"', { 586 ['OS=="android"', {
602 'sources!': [ 587 'sources!': [
603 'renderer/accessibility/renderer_accessibility_focus_only.cc', 588 'renderer/accessibility/renderer_accessibility_focus_only.cc',
604 'renderer/media/audio_decoder.cc', 589 'renderer/media/audio_decoder.cc',
605 'renderer/media/filter_helpers.cc', 590 'renderer/media/filter_helpers.cc',
606 'renderer/media/webmediaplayer_impl.cc', 591 'renderer/media/webmediaplayer_impl.cc',
607 ], 592 ],
608 'sources': [ 593 'sources': [
609 'renderer/external_popup_menu.cc', 594 'renderer/external_popup_menu.cc',
610 'renderer/external_popup_menu.h', 595 'renderer/external_popup_menu.h',
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 }], 779 }],
795 ], 780 ],
796 'target_conditions': [ 781 'target_conditions': [
797 ['OS=="android"', { 782 ['OS=="android"', {
798 'sources/': [ 783 'sources/': [
799 ['include', '^renderer/render_view_linux\\.cc$'], 784 ['include', '^renderer/render_view_linux\\.cc$'],
800 ], 785 ],
801 }], 786 }],
802 ], 787 ],
803 } 788 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | content/content_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698