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

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

Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge conflict in custom_button.cc Created 4 years, 6 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/views/controls/button/menu_button_unittest.cc ('k') | no next file » | 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 # Sources lists shared with GN build. 7 # Sources lists shared with GN build.
8 'views_sources': [ 8 'views_sources': [
9 'accessibility/native_view_accessibility.cc', 9 'accessibility/native_view_accessibility.cc',
10 'accessibility/native_view_accessibility.h', 10 'accessibility/native_view_accessibility.h',
11 'accessibility/native_view_accessibility_win.cc', 11 'accessibility/native_view_accessibility_win.cc',
12 'accessibility/native_view_accessibility_win.h', 12 'accessibility/native_view_accessibility_win.h',
13 'accessible_pane_view.cc', 13 'accessible_pane_view.cc',
14 'accessible_pane_view.h', 14 'accessible_pane_view.h',
15 'animation/bounds_animator.cc', 15 'animation/bounds_animator.cc',
16 'animation/bounds_animator.h', 16 'animation/bounds_animator.h',
17 'animation/button_ink_drop_delegate.cc', 17 'animation/flood_fill_ink_drop_ripple.cc',
18 'animation/button_ink_drop_delegate.h', 18 'animation/flood_fill_ink_drop_ripple.h',
19 'animation/ink_drop_ripple.cc',
20 'animation/ink_drop_ripple.h',
21 'animation/ink_drop.h', 19 'animation/ink_drop.h',
20 'animation/ink_drop_animation_ended_reason.cc',
21 'animation/ink_drop_animation_ended_reason.h',
22 'animation/ink_drop_factory.cc', 22 'animation/ink_drop_factory.cc',
23 'animation/ink_drop_factory.h', 23 'animation/ink_drop_factory.h',
24 'animation/ink_drop_impl.cc',
25 'animation/ink_drop_impl.h',
26 'animation/ink_drop_animation_ended_reason.cc',
27 'animation/ink_drop_animation_ended_reason.h',
28 'animation/ink_drop_ripple_observer.h',
29 'animation/ink_drop_delegate.h',
30 'animation/ink_drop_highlight.cc', 24 'animation/ink_drop_highlight.cc',
31 'animation/ink_drop_highlight.h', 25 'animation/ink_drop_highlight.h',
32 'animation/ink_drop_highlight_observer.h', 26 'animation/ink_drop_highlight_observer.h',
33 'animation/ink_drop_host.h', 27 'animation/ink_drop_host.h',
34 'animation/ink_drop_host_view.cc', 28 'animation/ink_drop_host_view.cc',
35 'animation/ink_drop_host_view.h', 29 'animation/ink_drop_host_view.h',
30 'animation/ink_drop_impl.cc',
31 'animation/ink_drop_impl.h',
36 'animation/ink_drop_painted_layer_delegates.cc', 32 'animation/ink_drop_painted_layer_delegates.cc',
37 'animation/ink_drop_painted_layer_delegates.h', 33 'animation/ink_drop_painted_layer_delegates.h',
34 'animation/ink_drop_ripple.cc',
35 'animation/ink_drop_ripple.h',
36 'animation/ink_drop_ripple_observer.h',
38 'animation/ink_drop_state.cc', 37 'animation/ink_drop_state.cc',
39 'animation/ink_drop_state.h', 38 'animation/ink_drop_state.h',
39 'animation/ink_drop_stub.h',
40 'animation/ink_drop_stub.cc',
40 'animation/scroll_animator.cc', 41 'animation/scroll_animator.cc',
41 'animation/scroll_animator.h', 42 'animation/scroll_animator.h',
42 'animation/flood_fill_ink_drop_ripple.cc',
43 'animation/flood_fill_ink_drop_ripple.h',
44 'animation/square_ink_drop_ripple.cc', 43 'animation/square_ink_drop_ripple.cc',
45 'animation/square_ink_drop_ripple.h', 44 'animation/square_ink_drop_ripple.h',
46 'background.cc', 45 'background.cc',
47 'background.h', 46 'background.h',
48 'border.cc', 47 'border.cc',
49 'border.h', 48 'border.h',
50 'bubble/bubble_border.cc', 49 'bubble/bubble_border.cc',
51 'bubble/bubble_border.h', 50 'bubble/bubble_border.h',
52 'bubble/bubble_dialog_delegate.cc', 51 'bubble/bubble_dialog_delegate.cc',
53 'bubble/bubble_dialog_delegate.h', 52 'bubble/bubble_dialog_delegate.h',
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 'widget/desktop_aura/desktop_factory_ozone.cc', 489 'widget/desktop_aura/desktop_factory_ozone.cc',
491 'widget/desktop_aura/desktop_factory_ozone.h', 490 'widget/desktop_aura/desktop_factory_ozone.h',
492 'widget/desktop_aura/desktop_screen_ozone.cc', 491 'widget/desktop_aura/desktop_screen_ozone.cc',
493 'widget/desktop_aura/desktop_window_tree_host_ozone.cc', 492 'widget/desktop_aura/desktop_window_tree_host_ozone.cc',
494 ], 493 ],
495 'views_test_support_sources': [ 494 'views_test_support_sources': [
496 'animation/test/flood_fill_ink_drop_ripple_test_api.cc', 495 'animation/test/flood_fill_ink_drop_ripple_test_api.cc',
497 'animation/test/flood_fill_ink_drop_ripple_test_api.h', 496 'animation/test/flood_fill_ink_drop_ripple_test_api.h',
498 'animation/test/ink_drop_highlight_test_api.cc', 497 'animation/test/ink_drop_highlight_test_api.cc',
499 'animation/test/ink_drop_highlight_test_api.h', 498 'animation/test/ink_drop_highlight_test_api.h',
499 'animation/test/ink_drop_host_view_test_api.cc',
500 'animation/test/ink_drop_host_view_test_api.h',
500 'animation/test/ink_drop_impl_test_api.cc', 501 'animation/test/ink_drop_impl_test_api.cc',
501 'animation/test/ink_drop_impl_test_api.h', 502 'animation/test/ink_drop_impl_test_api.h',
502 'animation/test/ink_drop_ripple_test_api.cc', 503 'animation/test/ink_drop_ripple_test_api.cc',
503 'animation/test/ink_drop_ripple_test_api.h', 504 'animation/test/ink_drop_ripple_test_api.h',
504 'animation/test/ink_drop_utils.cc', 505 'animation/test/ink_drop_utils.cc',
505 'animation/test/square_ink_drop_ripple_test_api.cc', 506 'animation/test/square_ink_drop_ripple_test_api.cc',
506 'animation/test/square_ink_drop_ripple_test_api.h', 507 'animation/test/square_ink_drop_ripple_test_api.h',
508 'animation/test/test_ink_drop.cc',
509 'animation/test/test_ink_drop.h',
507 'animation/test/test_ink_drop_animation_observer_helper.h', 510 'animation/test/test_ink_drop_animation_observer_helper.h',
508 'animation/test/test_ink_drop_delegate.cc',
509 'animation/test/test_ink_drop_delegate.h',
510 'animation/test/test_ink_drop_highlight_observer.cc', 511 'animation/test/test_ink_drop_highlight_observer.cc',
511 'animation/test/test_ink_drop_highlight_observer.h', 512 'animation/test/test_ink_drop_highlight_observer.h',
512 'animation/test/test_ink_drop_host.cc', 513 'animation/test/test_ink_drop_host.cc',
513 'animation/test/test_ink_drop_host.h', 514 'animation/test/test_ink_drop_host.h',
514 'animation/test/test_ink_drop_ripple_observer.cc', 515 'animation/test/test_ink_drop_ripple_observer.cc',
515 'animation/test/test_ink_drop_ripple_observer.h', 516 'animation/test/test_ink_drop_ripple_observer.h',
516 'controls/textfield/textfield_test_api.cc', 517 'controls/textfield/textfield_test_api.cc',
517 'controls/textfield/textfield_test_api.h', 518 'controls/textfield/textfield_test_api.h',
518 'test/capture_tracking_view.cc', 519 'test/capture_tracking_view.cc',
519 'test/capture_tracking_view.h', 520 'test/capture_tracking_view.h',
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 '../aura/aura.gyp:aura', 1044 '../aura/aura.gyp:aura',
1044 '../wm/wm.gyp:wm', 1045 '../wm/wm.gyp:wm',
1045 ], 1046 ],
1046 }], 1047 }],
1047 ], 1048 ],
1048 }, # target_name: macviews_interactive_ui_tests 1049 }, # target_name: macviews_interactive_ui_tests
1049 ], # targets 1050 ], # targets
1050 }], 1051 }],
1051 ], # conditions 1052 ], # conditions
1052 } 1053 }
OLDNEW
« no previous file with comments | « ui/views/controls/button/menu_button_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698