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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_common.gypi ('k') | content/content_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 159321d414254f43da60f1b64583ab7a96756a2d..45dd77c9bc93657c9f3ea9981db5c6cfdf9142c8 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -4,9 +4,12 @@
{
'dependencies': [
+ 'content_common_mojo_bindings',
'../gin/gin.gyp:gin',
'../jingle/jingle.gyp:jingle_glue',
'../media/media.gyp:media',
+ '../mojo/mojo.gyp:mojo_environment_chromium',
+ '../mojo/mojo.gyp:mojo_js_bindings_lib',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/WebKit/public/blink.gyp:blink',
@@ -580,24 +583,6 @@
'../base/allocator/allocator.gyp:allocator',
],
}],
- ['use_mojo==0', {
- 'sources!': [
- 'renderer/mojo/mojo_render_process_observer.cc',
- 'renderer/mojo/mojo_render_process_observer.h',
- 'renderer/web_ui_mojo.cc',
- 'renderer/web_ui_mojo.h',
- 'renderer/web_ui_mojo_context_state.cc',
- 'renderer/web_ui_mojo_context_state.h',
- 'renderer/web_ui_runner.cc',
- 'renderer/web_ui_runner.h',
- ],
- }, {
- 'dependencies': [
- 'content_common_mojo_bindings',
- '../mojo/mojo.gyp:mojo_environment_chromium',
- '../mojo/mojo.gyp:mojo_js_bindings_lib',
- ],
- }],
['OS=="android"', {
'sources!': [
'renderer/accessibility/renderer_accessibility_focus_only.cc',
« 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