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

Side by Side Diff: ui/ui.gyp

Issue 10830166: Revert 149888 - Copy aura::Event into ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/base/event_unittest.cc ('k') | ui/ui_unittests.gypi » ('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 }, 8 },
9 'includes': [ 9 'includes': [
10 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 'base/dragdrop/gtk_dnd_util.cc', 143 'base/dragdrop/gtk_dnd_util.cc',
144 'base/dragdrop/gtk_dnd_util.h', 144 'base/dragdrop/gtk_dnd_util.h',
145 'base/dragdrop/os_exchange_data.cc', 145 'base/dragdrop/os_exchange_data.cc',
146 'base/dragdrop/os_exchange_data.h', 146 'base/dragdrop/os_exchange_data.h',
147 'base/dragdrop/os_exchange_data_provider_aura.cc', 147 'base/dragdrop/os_exchange_data_provider_aura.cc',
148 'base/dragdrop/os_exchange_data_provider_aura.h', 148 'base/dragdrop/os_exchange_data_provider_aura.h',
149 'base/dragdrop/os_exchange_data_provider_gtk.cc', 149 'base/dragdrop/os_exchange_data_provider_gtk.cc',
150 'base/dragdrop/os_exchange_data_provider_gtk.h', 150 'base/dragdrop/os_exchange_data_provider_gtk.h',
151 'base/dragdrop/os_exchange_data_provider_win.cc', 151 'base/dragdrop/os_exchange_data_provider_win.cc',
152 'base/dragdrop/os_exchange_data_provider_win.h', 152 'base/dragdrop/os_exchange_data_provider_win.h',
153 'base/event.cc',
154 'base/event.h',
155 'base/events.h', 153 'base/events.h',
156 'base/gestures/gesture_configuration.cc', 154 'base/gestures/gesture_configuration.cc',
157 'base/gestures/gesture_configuration.h', 155 'base/gestures/gesture_configuration.h',
158 'base/gestures/gesture_point.cc', 156 'base/gestures/gesture_point.cc',
159 'base/gestures/gesture_point.h', 157 'base/gestures/gesture_point.h',
160 'base/gestures/gesture_recognizer.h', 158 'base/gestures/gesture_recognizer.h',
161 'base/gestures/gesture_recognizer_impl.cc', 159 'base/gestures/gesture_recognizer_impl.cc',
162 'base/gestures/gesture_recognizer_impl.h', 160 'base/gestures/gesture_recognizer_impl.h',
163 'base/gestures/gesture_sequence.cc', 161 'base/gestures/gesture_sequence.cc',
164 'base/gestures/gesture_sequence.h', 162 'base/gestures/gesture_sequence.h',
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 # 'sources/' rather than 'sources!'. 567 # 'sources/' rather than 'sources!'.
570 'sources/': [ 568 'sources/': [
571 ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'], 569 ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'],
572 ['exclude', '^base/dragdrop/drag_utils_gtk.cc'], 570 ['exclude', '^base/dragdrop/drag_utils_gtk.cc'],
573 ['exclude', '^base/dragdrop/drag_utils.cc'], 571 ['exclude', '^base/dragdrop/drag_utils.cc'],
574 ['exclude', '^base/dragdrop/drag_utils.h'], 572 ['exclude', '^base/dragdrop/drag_utils.h'],
575 ['exclude', '^base/dragdrop/os_exchange_data.cc'], 573 ['exclude', '^base/dragdrop/os_exchange_data.cc'],
576 ['exclude', '^base/dragdrop/os_exchange_data.h'], 574 ['exclude', '^base/dragdrop/os_exchange_data.h'],
577 ['exclude', '^base/dragdrop/os_exchange_data_provider_gtk.cc'], 575 ['exclude', '^base/dragdrop/os_exchange_data_provider_gtk.cc'],
578 ['exclude', '^base/dragdrop/os_exchange_data_provider_gtk.h'], 576 ['exclude', '^base/dragdrop/os_exchange_data_provider_gtk.h'],
579 ['exclude', '^base/event.cc'],
580 ['exclude', '^base/event.h'],
581 ], 577 ],
582 }, { 578 }, {
583 # Note: because of gyp predence rules this has to be defined as 579 # Note: because of gyp predence rules this has to be defined as
584 # 'sources/' rather than 'sources!'. 580 # 'sources/' rather than 'sources!'.
585 'sources/': [ 581 'sources/': [
586 ['include', '^base/dragdrop/os_exchange_data.cc'], 582 ['include', '^base/dragdrop/os_exchange_data.cc'],
587 ], 583 ],
588 }], 584 }],
589 ], 585 ],
590 }], 586 }],
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 ], 763 ],
768 'conditions': [ 764 'conditions': [
769 ['inside_chromium_build == 1 and OS != "ios"', { 765 ['inside_chromium_build == 1 and OS != "ios"', {
770 # TODO(ios): The ui tests do not compile yet on iOS. 766 # TODO(ios): The ui tests do not compile yet on iOS.
771 'includes': [ 767 'includes': [
772 'ui_unittests.gypi', 768 'ui_unittests.gypi',
773 ]}, 769 ]},
774 ], 770 ],
775 ], 771 ],
776 } 772 }
OLDNEW
« no previous file with comments | « ui/base/event_unittest.cc ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698