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

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

Issue 946623002: [Code cleanup]Remove webui keyboard mojo binding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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
« 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',
9 'input_tools_root_dir': '../../third_party/google_input_tools/src/chrome/os' , 8 'input_tools_root_dir': '../../third_party/google_input_tools/src/chrome/os' ,
10 'inputview_gen_js': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/resources/inputv iew.js', 9 'inputview_gen_js': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/resources/inputv iew.js',
11 }, 10 },
12 'targets': [ 11 'targets': [
13 {
14 'target_name': 'keyboard_mojom_bindings',
15 'type': 'none',
16 'sources': [
17 'webui/keyboard.mojom',
18 ],
19 'includes': [ '../../third_party/mojo/mojom_bindings_generator.gypi' ],
20 },
21 { 12 {
22 # GN version: //ui/keyboard:resources 13 # GN version: //ui/keyboard:resources
23 'target_name': 'keyboard_resources', 14 'target_name': 'keyboard_resources',
24 'dependencies': [ 15 'dependencies': [
25 'keyboard_mojom_bindings',
26 '../../third_party/google_input_tools/inputview.gyp:inputview', 16 '../../third_party/google_input_tools/inputview.gyp:inputview',
27 ], 17 ],
28 'type': 'none', 18 'type': 'none',
29 'variables': { 19 'variables': {
30 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard', 20 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard',
31 }, 21 },
32 'actions': [ 22 'actions': [
33 { 23 {
34 'action_name': 'keyboard_resources', 24 'action_name': 'keyboard_resources',
35 'variables': { 25 'variables': {
36 'grit_grd_file': 'keyboard_resources.grd', 26 'grit_grd_file': 'keyboard_resources.grd',
37 'grit_additional_defines': [ 27 'grit_additional_defines': [
38 '-E', 'keyboard_mojom_gen_js=<(keyboard_mojom_gen_js)',
39 '-E', 'input_tools_root_dir=<(input_tools_root_dir)', 28 '-E', 'input_tools_root_dir=<(input_tools_root_dir)',
40 '-E', 'inputview_gen_js=<(inputview_gen_js)', 29 '-E', 'inputview_gen_js=<(inputview_gen_js)',
41 ], 30 ],
42 }, 31 },
43 'includes': [ '../../build/grit_action.gypi' ], 32 'includes': [ '../../build/grit_action.gypi' ],
44 }, 33 },
45 ], 34 ],
46 'includes': [ '../../build/grit_target.gypi' ], 35 'includes': [ '../../build/grit_target.gypi' ],
47 'copies': [ 36 'copies': [
48 { 37 {
49 'destination': '<(PRODUCT_DIR)', 38 'destination': '<(PRODUCT_DIR)',
50 'files': [ 39 'files': [
51 '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/keyboard_resources.pak', 40 '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/keyboard_resources.pak',
52 ], 41 ],
53 }, 42 },
54 ], 43 ],
55 }, 44 },
56 { 45 {
57 # GN version: //ui/keyboard 46 # GN version: //ui/keyboard
58 'target_name': 'keyboard', 47 'target_name': 'keyboard',
59 'type': '<(component)', 48 'type': '<(component)',
60 'dependencies': [ 49 'dependencies': [
61 '../../base/base.gyp:base', 50 '../../base/base.gyp:base',
62 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 51 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
63 '../../content/content.gyp:content_browser', 52 '../../content/content.gyp:content_browser',
64 '../../ipc/ipc.gyp:ipc', 53 '../../ipc/ipc.gyp:ipc',
65 '../../mojo/mojo_base.gyp:mojo_environment_chromium',
66 '../../skia/skia.gyp:skia', 54 '../../skia/skia.gyp:skia',
67 '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
68 '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
69 '../../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
70 '../../url/url.gyp:url_lib', 55 '../../url/url.gyp:url_lib',
71 '../aura/aura.gyp:aura', 56 '../aura/aura.gyp:aura',
72 '../base/ime/ui_base_ime.gyp:ui_base_ime', 57 '../base/ime/ui_base_ime.gyp:ui_base_ime',
73 '../base/ui_base.gyp:ui_base', 58 '../base/ui_base.gyp:ui_base',
74 '../compositor/compositor.gyp:compositor', 59 '../compositor/compositor.gyp:compositor',
75 '../events/events.gyp:dom4_keycode_converter', 60 '../events/events.gyp:dom4_keycode_converter',
76 '../events/events.gyp:events', 61 '../events/events.gyp:events',
77 '../gfx/gfx.gyp:gfx', 62 '../gfx/gfx.gyp:gfx',
78 '../gfx/gfx.gyp:gfx_geometry', 63 '../gfx/gfx.gyp:gfx_geometry',
79 '../wm/wm.gyp:wm', 64 '../wm/wm.gyp:wm',
80 'keyboard_mojom_bindings',
81 'keyboard_resources', 65 'keyboard_resources',
82 ], 66 ],
83 'defines': [ 67 'defines': [
84 'KEYBOARD_IMPLEMENTATION', 68 'KEYBOARD_IMPLEMENTATION',
85 ], 69 ],
86 'sources': [ 70 'sources': [
87 '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/webui/keyboard.mojom.cc',
88 'keyboard.cc', 71 'keyboard.cc',
89 'keyboard.h', 72 'keyboard.h',
90 'keyboard_constants.cc', 73 'keyboard_constants.cc',
91 'keyboard_constants.h', 74 'keyboard_constants.h',
92 'keyboard_controller.cc', 75 'keyboard_controller.cc',
93 'keyboard_controller.h', 76 'keyboard_controller.h',
94 'keyboard_controller_observer.h', 77 'keyboard_controller_observer.h',
95 'keyboard_controller_proxy.cc', 78 'keyboard_controller_proxy.cc',
96 'keyboard_controller_proxy.h', 79 'keyboard_controller_proxy.h',
97 'keyboard_export.h', 80 'keyboard_export.h',
98 'keyboard_layout_manager.cc', 81 'keyboard_layout_manager.cc',
99 'keyboard_layout_manager.h', 82 'keyboard_layout_manager.h',
100 'keyboard_switches.cc', 83 'keyboard_switches.cc',
101 'keyboard_switches.h', 84 'keyboard_switches.h',
102 'keyboard_util.cc', 85 'keyboard_util.cc',
103 'keyboard_util.h', 86 'keyboard_util.h',
104 'webui/vk_mojo_handler.cc',
105 'webui/vk_mojo_handler.h',
106 'webui/vk_webui_controller.cc',
107 'webui/vk_webui_controller.h',
108 ] 87 ]
109 }, 88 },
110 { 89 {
111 'target_name': 'keyboard_unittests', 90 'target_name': 'keyboard_unittests',
112 'type': '<(gtest_target_type)', 91 'type': '<(gtest_target_type)',
113 'dependencies': [ 92 'dependencies': [
114 '../../base/base.gyp:base', 93 '../../base/base.gyp:base',
115 '../../base/base.gyp:test_support_base', 94 '../../base/base.gyp:test_support_base',
116 '../../content/content.gyp:content', 95 '../../content/content.gyp:content',
117 '../../skia/skia.gyp:skia', 96 '../../skia/skia.gyp:skia',
(...skipping 26 matching lines...) Expand all
144 }], 123 }],
145 ['OS=="win" and win_use_allocator_shim==1', { 124 ['OS=="win" and win_use_allocator_shim==1', {
146 'dependencies': [ 125 'dependencies': [
147 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 126 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
148 ], 127 ],
149 }], 128 }],
150 ], 129 ],
151 }, 130 },
152 ], 131 ],
153 } 132 }
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