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

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

Issue 250113002: Move DefaultActivationClient to wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 7 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/aura/test/aura_test_helper.cc ('k') | ui/keyboard/keyboard_controller_unittest.cc » ('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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 '../../testing/gtest.gyp:gtest', 84 '../../testing/gtest.gyp:gtest',
85 '../../url/url.gyp:url_lib', 85 '../../url/url.gyp:url_lib',
86 '../aura/aura.gyp:aura', 86 '../aura/aura.gyp:aura',
87 '../aura/aura.gyp:aura_test_support', 87 '../aura/aura.gyp:aura_test_support',
88 '../base/ui_base.gyp:ui_base', 88 '../base/ui_base.gyp:ui_base',
89 '../compositor/compositor.gyp:compositor', 89 '../compositor/compositor.gyp:compositor',
90 '../compositor/compositor.gyp:compositor_test_support', 90 '../compositor/compositor.gyp:compositor_test_support',
91 '../gfx/gfx.gyp:gfx', 91 '../gfx/gfx.gyp:gfx',
92 '../gfx/gfx.gyp:gfx_geometry', 92 '../gfx/gfx.gyp:gfx_geometry',
93 '../resources/ui_resources.gyp:ui_test_pak', 93 '../resources/ui_resources.gyp:ui_test_pak',
94 '../wm/wm.gyp:wm',
94 'keyboard', 95 'keyboard',
95 ], 96 ],
96 'sources': [ 97 'sources': [
97 'test/run_all_unittests.cc', 98 'test/run_all_unittests.cc',
98 'keyboard_controller_unittest.cc', 99 'keyboard_controller_unittest.cc',
99 ], 100 ],
100 'conditions': [ 101 'conditions': [
101 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 102 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
102 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { 103 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
103 'dependencies': [ 104 'dependencies': [
104 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 105 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
105 ], 106 ],
106 'link_settings': { 107 'link_settings': {
107 'ldflags': ['-rdynamic'], 108 'ldflags': ['-rdynamic'],
108 }, 109 },
109 }], 110 }],
110 ['OS=="win" and win_use_allocator_shim==1', { 111 ['OS=="win" and win_use_allocator_shim==1', {
111 'dependencies': [ 112 'dependencies': [
112 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 113 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
113 ], 114 ],
114 }], 115 }],
115 ], 116 ],
116 }, 117 },
117 ], 118 ],
118 } 119 }
OLDNEW
« no previous file with comments | « ui/aura/test/aura_test_helper.cc ('k') | ui/keyboard/keyboard_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698