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

Side by Side Diff: ash/ash.gyp

Issue 613343005: Automatic deployment of the virtual keyboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo. 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
« no previous file with comments | « no previous file | ash/shell.h » ('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) 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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 # These files lists are shared with the GN build. 9 # These files lists are shared with the GN build.
10 'ash_sources': [ 10 'ash_sources': [
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 ], 932 ],
933 'sources': [ 933 'sources': [
934 '<@(ash_sources)', 934 '<@(ash_sources)',
935 ], 935 ],
936 'conditions': [ 936 'conditions': [
937 ['OS=="win"', { 937 ['OS=="win"', {
938 'sources!': [ 938 'sources!': [
939 # Note: sources list duplicated in GN build. 939 # Note: sources list duplicated in GN build.
940 "sticky_keys/sticky_keys_controller.cc", 940 "sticky_keys/sticky_keys_controller.cc",
941 "sticky_keys/sticky_keys_controller.h", 941 "sticky_keys/sticky_keys_controller.h",
942 'virtual_keyboard_controller.cc',
943 'virtual_keyboard_controller.h'
942 ], 944 ],
943 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 945 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
944 'msvs_disabled_warnings': [ 4267, ], 946 'msvs_disabled_warnings': [ 4267, ],
945 }], 947 }],
946 ['use_x11!=1', { 948 ['use_x11!=1', {
947 'sources!': [ 949 'sources!': [
948 # Note: sources list duplicated in GN build. 950 # Note: sources list duplicated in GN build.
949 'accelerators/key_hold_detector.cc', 951 'accelerators/key_hold_detector.cc',
950 'accelerators/key_hold_detector.h', 952 'accelerators/key_hold_detector.h',
951 'accelerators/magnifier_key_scroller.cc', 953 'accelerators/magnifier_key_scroller.cc',
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 'focus_cycler_unittest.cc', 1121 'focus_cycler_unittest.cc',
1120 # All tests for multiple displays: not supported on Windows Ash. 1122 # All tests for multiple displays: not supported on Windows Ash.
1121 'wm/drag_window_resizer_unittest.cc', 1123 'wm/drag_window_resizer_unittest.cc',
1122 # Can't resize on Windows Ash. http://crbug.com/165962 1124 # Can't resize on Windows Ash. http://crbug.com/165962
1123 'magnifier/magnification_controller_unittest.cc', 1125 'magnifier/magnification_controller_unittest.cc',
1124 'wm/workspace/workspace_window_resizer_unittest.cc', 1126 'wm/workspace/workspace_window_resizer_unittest.cc',
1125 'sticky_keys/sticky_keys_overlay_unittest.cc', 1127 'sticky_keys/sticky_keys_overlay_unittest.cc',
1126 'sticky_keys/sticky_keys_unittest.cc', 1128 'sticky_keys/sticky_keys_unittest.cc',
1127 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c', 1129 'system/tray/media_security/multi_profile_media_tray_item_unittest.c c',
1128 'autoclick/autoclick_unittest.cc', 1130 'autoclick/autoclick_unittest.cc',
1131 "virtual_keyboard_controller_unittest.cc"
1129 ], 1132 ],
1130 'sources': [ 1133 'sources': [
1131 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', 1134 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
1132 ], 1135 ],
1133 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1136 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1134 'msvs_disabled_warnings': [ 4267, ], 1137 'msvs_disabled_warnings': [ 4267, ],
1135 }], 1138 }],
1136 ['OS=="win" and win_use_allocator_shim==1', { 1139 ['OS=="win" and win_use_allocator_shim==1', {
1137 'dependencies': [ 1140 'dependencies': [
1138 '../base/allocator/allocator.gyp:allocator', 1141 '../base/allocator/allocator.gyp:allocator',
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 '../build/isolate.gypi', 1296 '../build/isolate.gypi',
1294 ], 1297 ],
1295 'sources': [ 1298 'sources': [
1296 'ash_unittests.isolate', 1299 'ash_unittests.isolate',
1297 ], 1300 ],
1298 }, 1301 },
1299 ], 1302 ],
1300 }], 1303 }],
1301 ], 1304 ],
1302 } 1305 }
OLDNEW
« no previous file with comments | « no previous file | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698