Index: ui/keyboard/keyboard.gyp |
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp |
index e780048b3ecb4f48509782c8b0ca0931dc66de24..c0484db0b0e132d5532cba52eb0544bce5621730 100644 |
--- a/ui/keyboard/keyboard.gyp |
+++ b/ui/keyboard/keyboard.gyp |
@@ -5,10 +5,20 @@ |
{ |
'variables': { |
'chromium_code': 1, |
+ 'keyboard_mojom_gen_js': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/webui/keyboard.mojom.js', |
}, |
'targets': [ |
{ |
+ 'target_name': 'keyboard_mojom_bindings', |
+ 'type': 'none', |
+ 'sources': [ |
+ 'webui/keyboard.mojom', |
+ ], |
+ 'includes': [ '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ], |
+ }, |
+ { |
'target_name': 'keyboard_resources', |
+ 'dependencies': [ 'keyboard_mojom_bindings', ], |
'type': 'none', |
'variables': { |
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard', |
@@ -18,6 +28,9 @@ |
'action_name': 'keyboard_resources', |
'variables': { |
'grit_grd_file': 'keyboard_resources.grd', |
+ 'grit_additional_defines': [ |
+ '-E', 'keyboard_mojom_gen_js=<(keyboard_mojom_gen_js)', |
+ ], |
}, |
'includes': [ '../../build/grit_action.gypi' ], |
}, |
@@ -39,7 +52,12 @@ |
'../../base/base.gyp:base', |
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
'../../content/content.gyp:content_browser', |
+ '../../content/content_resources.gyp:content_resources', |
'../../ipc/ipc.gyp:ipc', |
+ '../../mojo/mojo.gyp:mojo_cpp_bindings', |
+ '../../mojo/mojo.gyp:mojo_environment_chromium', |
+ '../../mojo/mojo.gyp:mojo_js_bindings', |
+ '../../mojo/mojo.gyp:mojo_system_impl', |
'../../skia/skia.gyp:skia', |
'../../url/url.gyp:url_lib', |
'../aura/aura.gyp:aura', |
@@ -49,6 +67,7 @@ |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
'../wm/wm.gyp:wm', |
+ 'keyboard_mojom_bindings', |
'keyboard_resources', |
], |
'defines': [ |
@@ -71,6 +90,11 @@ |
'keyboard_switches.h', |
'keyboard_util.cc', |
'keyboard_util.h', |
+ 'webui/vk_mojo_handler.cc', |
+ 'webui/vk_mojo_handler.h', |
+ 'webui/vk_webui_controller.cc', |
+ 'webui/vk_webui_controller.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/webui/keyboard.mojom.cc', |
] |
}, |
{ |