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

Side by Side Diff: ui/base/ui_base_tests.gyp

Issue 833893003: Move UserActivityDetector to ui/base/user_activity/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: don't build test on android Created 5 years, 11 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/base/ui_base.gyp ('k') | ui/base/user_activity/user_activity_detector.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 'ime/remote_input_method_win_unittest.cc', 72 'ime/remote_input_method_win_unittest.cc',
73 'ime/win/imm32_manager_unittest.cc', 73 'ime/win/imm32_manager_unittest.cc',
74 'ime/win/tsf_input_scope_unittest.cc', 74 'ime/win/tsf_input_scope_unittest.cc',
75 'models/list_model_unittest.cc', 75 'models/list_model_unittest.cc',
76 'models/list_selection_model_unittest.cc', 76 'models/list_selection_model_unittest.cc',
77 'models/tree_node_model_unittest.cc', 77 'models/tree_node_model_unittest.cc',
78 'test/test_clipboard_unittest.cc', 78 'test/test_clipboard_unittest.cc',
79 'test/data/resource.h', 79 'test/data/resource.h',
80 'text/bytes_formatting_unittest.cc', 80 'text/bytes_formatting_unittest.cc',
81 'touch/selection_bound_unittest.cc', 81 'touch/selection_bound_unittest.cc',
82 'user_activity/user_activity_detector_unittest.cc',
82 'view_prop_unittest.cc', 83 'view_prop_unittest.cc',
83 'webui/web_ui_util_unittest.cc', 84 'webui/web_ui_util_unittest.cc',
84 'x/selection_requestor_unittest.cc', 85 'x/selection_requestor_unittest.cc',
85 ], 86 ],
86 'include_dirs': [ 87 'include_dirs': [
87 '../..', 88 '../..',
88 ], 89 ],
89 'conditions': [ 90 'conditions': [
90 ['OS!="ios"', { 91 ['OS!="ios"', {
91 'sources' : [ '<@(_all_sources)' ], 92 'sources' : [ '<@(_all_sources)' ],
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 }, 137 },
137 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 138 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
138 'msvs_disabled_warnings': [ 4267, ], 139 'msvs_disabled_warnings': [ 4267, ],
139 }], 140 }],
140 ['OS == "android"', { 141 ['OS == "android"', {
141 'dependencies': [ 142 'dependencies': [
142 '../../testing/android/native_test.gyp:native_test_native_code', 143 '../../testing/android/native_test.gyp:native_test_native_code',
143 ], 144 ],
144 'sources!': [ 145 'sources!': [
145 'touch/selection_bound_unittest.cc', 146 'touch/selection_bound_unittest.cc',
147 'user_activity/user_activity_detector_unittest.cc',
146 ], 148 ],
147 }], 149 }],
148 ['use_pango == 1', { 150 ['use_pango == 1', {
149 'dependencies': [ 151 'dependencies': [
150 '../../build/linux/system.gyp:pangocairo', 152 '../../build/linux/system.gyp:pangocairo',
151 ], 153 ],
152 'conditions': [ 154 'conditions': [
153 ['use_allocator!="none"', { 155 ['use_allocator!="none"', {
154 'dependencies': [ 156 'dependencies': [
155 '../../base/allocator/allocator.gyp:allocator', 157 '../../base/allocator/allocator.gyp:allocator',
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 'dependencies': [ 294 'dependencies': [
293 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 295 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
294 ], 296 ],
295 }], 297 }],
296 ], 298 ],
297 }, 299 },
298 ], 300 ],
299 }], 301 }],
300 ], 302 ],
301 } 303 }
OLDNEW
« no previous file with comments | « ui/base/ui_base.gyp ('k') | ui/base/user_activity/user_activity_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698