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

Side by Side Diff: chromeos/chromeos.gyp

Issue 693733002: Adds ozone support for ime keyboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'chromeos_sources': [ 9 'chromeos_sources': [
10 'accelerometer/accelerometer_reader.cc', 10 'accelerometer/accelerometer_reader.cc',
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 'disks/disk_mount_manager.cc', 223 'disks/disk_mount_manager.cc',
224 'disks/disk_mount_manager.h', 224 'disks/disk_mount_manager.h',
225 'ime/component_extension_ime_manager.cc', 225 'ime/component_extension_ime_manager.cc',
226 'ime/component_extension_ime_manager.h', 226 'ime/component_extension_ime_manager.h',
227 'ime/composition_text.cc', 227 'ime/composition_text.cc',
228 'ime/composition_text.h', 228 'ime/composition_text.h',
229 'ime/extension_ime_util.cc', 229 'ime/extension_ime_util.cc',
230 'ime/extension_ime_util.h', 230 'ime/extension_ime_util.h',
231 'ime/fake_ime_keyboard.cc', 231 'ime/fake_ime_keyboard.cc',
232 'ime/fake_ime_keyboard.h', 232 'ime/fake_ime_keyboard.h',
233 'ime/ime_keyboard.cc',
233 'ime/ime_keyboard.h', 234 'ime/ime_keyboard.h',
234 'ime/ime_keyboard_ozone.cc', 235 'ime/ime_keyboard_ozone.cc',
236 'ime/ime_keyboard_ozone.h',
237 'ime/ime_keyboard_x11.cc',
235 'ime/ime_keyboard_x11.h', 238 'ime/ime_keyboard_x11.h',
236 'ime/ime_keyboard_x11.cc',
237 'ime/input_method_delegate.h', 239 'ime/input_method_delegate.h',
238 'ime/input_method_descriptor.cc', 240 'ime/input_method_descriptor.cc',
239 'ime/input_method_descriptor.h', 241 'ime/input_method_descriptor.h',
240 'ime/input_method_manager.cc', 242 'ime/input_method_manager.cc',
241 'ime/input_method_manager.h', 243 'ime/input_method_manager.h',
242 'ime/input_method_whitelist.cc', 244 'ime/input_method_whitelist.cc',
243 'ime/input_method_whitelist.h', 245 'ime/input_method_whitelist.h',
244 'login/auth/auth_attempt_state.cc', 246 'login/auth/auth_attempt_state.cc',
245 'login/auth/auth_attempt_state.h', 247 'login/auth/auth_attempt_state.h',
246 'login/auth/auth_attempt_state_resolver.cc', 248 'login/auth/auth_attempt_state_resolver.cc',
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 'conditions': [ 488 'conditions': [
487 ['use_x11 == 1', { 489 ['use_x11 == 1', {
488 'dependencies': [ 490 'dependencies': [
489 '../build/linux/system.gyp:x11', 491 '../build/linux/system.gyp:x11',
490 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 492 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
491 ], 493 ],
492 }, { 494 }, {
493 # use_x11 == 0 495 # use_x11 == 0
494 'sources!': [ 496 'sources!': [
495 'ime/keyboard_controller.cc', 497 'ime/keyboard_controller.cc',
496 'ime/ime_keyboard.h', 498 'ime/ime_keyboard.h'
497 ], 499 ],
498 }], 500 }],
499 ], 501 ],
500 }, 502 },
501 { 503 {
502 # GN version: //chromeos:test_support 504 # GN version: //chromeos:test_support
503 # This target contains mocks that can be used to write unit tests. 505 # This target contains mocks that can be used to write unit tests.
504 'target_name': 'chromeos_test_support', 506 'target_name': 'chromeos_test_support',
505 'type': 'static_library', 507 'type': 'static_library',
506 'dependencies': [ 508 'dependencies': [
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto', 676 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto',
675 ], 677 ],
676 'variables': { 678 'variables': {
677 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome', 679 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
678 'proto_out_dir': 'chromeos/cryptohome', 680 'proto_out_dir': 'chromeos/cryptohome',
679 }, 681 },
680 'includes': ['../build/protoc.gypi'], 682 'includes': ['../build/protoc.gypi'],
681 }, 683 },
682 ], 684 ],
683 } 685 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698