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

Side by Side Diff: ui/keyboard/keyboard.gyp

Issue 328303008: athena: Use mojo to provide the bindings for the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 years, 4 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 | « ui/keyboard/keyboard.cc ('k') | ui/keyboard/keyboard_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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'keyboard_mojom_gen_js': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/webui/keybo ard.mojom.js',
8 }, 9 },
9 'targets': [ 10 'targets': [
10 { 11 {
12 'target_name': 'keyboard_mojom_bindings',
13 'type': 'none',
14 'sources': [
15 'webui/keyboard.mojom',
16 ],
17 'includes': [ '../../mojo/public/tools/bindings/mojom_bindings_generator.g ypi' ],
18 },
19 {
11 # GN version: //ui/keyboard:resources 20 # GN version: //ui/keyboard:resources
12 'target_name': 'keyboard_resources', 21 'target_name': 'keyboard_resources',
22 'dependencies': [ 'keyboard_mojom_bindings', ],
13 'type': 'none', 23 'type': 'none',
14 'variables': { 24 'variables': {
15 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard', 25 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard',
16 }, 26 },
17 'actions': [ 27 'actions': [
18 { 28 {
19 'action_name': 'keyboard_resources', 29 'action_name': 'keyboard_resources',
20 'variables': { 30 'variables': {
21 'grit_grd_file': 'keyboard_resources.grd', 31 'grit_grd_file': 'keyboard_resources.grd',
32 'grit_additional_defines': [
33 '-E', 'keyboard_mojom_gen_js=<(keyboard_mojom_gen_js)',
34 ],
22 }, 35 },
23 'includes': [ '../../build/grit_action.gypi' ], 36 'includes': [ '../../build/grit_action.gypi' ],
24 }, 37 },
25 ], 38 ],
26 'includes': [ '../../build/grit_target.gypi' ], 39 'includes': [ '../../build/grit_target.gypi' ],
27 'copies': [ 40 'copies': [
28 { 41 {
29 'destination': '<(PRODUCT_DIR)', 42 'destination': '<(PRODUCT_DIR)',
30 'files': [ 43 'files': [
31 '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/keyboard_resources.pak', 44 '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/keyboard_resources.pak',
32 ], 45 ],
33 }, 46 },
34 ], 47 ],
35 }, 48 },
36 { 49 {
37 # GN version: //ui/keyboard 50 # GN version: //ui/keyboard
38 'target_name': 'keyboard', 51 'target_name': 'keyboard',
39 'type': '<(component)', 52 'type': '<(component)',
40 'dependencies': [ 53 'dependencies': [
41 '../../base/base.gyp:base', 54 '../../base/base.gyp:base',
42 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 55 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
43 '../../content/content.gyp:content_browser', 56 '../../content/content.gyp:content_browser',
57 '../../content/content_resources.gyp:content_resources',
44 '../../ipc/ipc.gyp:ipc', 58 '../../ipc/ipc.gyp:ipc',
59 '../../mojo/mojo_base.gyp:mojo_cpp_bindings',
60 '../../mojo/mojo_base.gyp:mojo_environment_chromium',
61 '../../mojo/mojo_base.gyp:mojo_js_bindings',
62 '../../mojo/mojo_base.gyp:mojo_system_impl',
45 '../../skia/skia.gyp:skia', 63 '../../skia/skia.gyp:skia',
46 '../../url/url.gyp:url_lib', 64 '../../url/url.gyp:url_lib',
47 '../aura/aura.gyp:aura', 65 '../aura/aura.gyp:aura',
48 '../base/ui_base.gyp:ui_base', 66 '../base/ui_base.gyp:ui_base',
49 '../compositor/compositor.gyp:compositor', 67 '../compositor/compositor.gyp:compositor',
50 '../events/events.gyp:events', 68 '../events/events.gyp:events',
51 '../gfx/gfx.gyp:gfx', 69 '../gfx/gfx.gyp:gfx',
52 '../gfx/gfx.gyp:gfx_geometry', 70 '../gfx/gfx.gyp:gfx_geometry',
53 '../wm/wm.gyp:wm', 71 '../wm/wm.gyp:wm',
72 'keyboard_mojom_bindings',
54 'keyboard_resources', 73 'keyboard_resources',
55 ], 74 ],
56 'defines': [ 75 'defines': [
57 'KEYBOARD_IMPLEMENTATION', 76 'KEYBOARD_IMPLEMENTATION',
58 ], 77 ],
59 'sources': [ 78 'sources': [
60 'keyboard.cc', 79 'keyboard.cc',
61 'keyboard.h', 80 'keyboard.h',
62 'keyboard_constants.cc', 81 'keyboard_constants.cc',
63 'keyboard_constants.h', 82 'keyboard_constants.h',
64 'keyboard_controller.cc', 83 'keyboard_controller.cc',
65 'keyboard_controller.h', 84 'keyboard_controller.h',
66 'keyboard_controller_observer.h', 85 'keyboard_controller_observer.h',
67 'keyboard_controller_proxy.cc', 86 'keyboard_controller_proxy.cc',
68 'keyboard_controller_proxy.h', 87 'keyboard_controller_proxy.h',
69 'keyboard_layout_manager.h', 88 'keyboard_layout_manager.h',
70 'keyboard_layout_manager.cc', 89 'keyboard_layout_manager.cc',
71 'keyboard_export.h', 90 'keyboard_export.h',
72 'keyboard_switches.cc', 91 'keyboard_switches.cc',
73 'keyboard_switches.h', 92 'keyboard_switches.h',
74 'keyboard_util.cc', 93 'keyboard_util.cc',
75 'keyboard_util.h', 94 'keyboard_util.h',
95 'webui/vk_mojo_handler.cc',
96 'webui/vk_mojo_handler.h',
97 'webui/vk_webui_controller.cc',
98 'webui/vk_webui_controller.h',
99 '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/webui/keyboard.mojom.cc',
76 ] 100 ]
77 }, 101 },
78 { 102 {
79 'target_name': 'keyboard_unittests', 103 'target_name': 'keyboard_unittests',
80 'type': '<(gtest_target_type)', 104 'type': '<(gtest_target_type)',
81 'dependencies': [ 105 'dependencies': [
82 '../../base/base.gyp:base', 106 '../../base/base.gyp:base',
83 '../../base/base.gyp:test_support_base', 107 '../../base/base.gyp:test_support_base',
84 '../../content/content.gyp:content', 108 '../../content/content.gyp:content',
85 '../../skia/skia.gyp:skia', 109 '../../skia/skia.gyp:skia',
(...skipping 25 matching lines...) Expand all
111 }], 135 }],
112 ['OS=="win" and win_use_allocator_shim==1', { 136 ['OS=="win" and win_use_allocator_shim==1', {
113 'dependencies': [ 137 'dependencies': [
114 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 138 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
115 ], 139 ],
116 }], 140 }],
117 ], 141 ],
118 }, 142 },
119 ], 143 ],
120 } 144 }
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard.cc ('k') | ui/keyboard/keyboard_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698