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

Side by Side Diff: ash/ash.gyp

Issue 2167643005: Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve conflicts Created 4 years, 5 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 | « no previous file | ash/aura/wm_shell_aura.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 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'ash_sources': [ 9 'ash_sources': [
10 'accelerators/accelerator_commands_aura.cc', 10 'accelerators/accelerator_commands_aura.cc',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 'common/gpu_support_stub.h', 76 'common/gpu_support_stub.h',
77 'common/keyboard/keyboard_ui.cc', 77 'common/keyboard/keyboard_ui.cc',
78 'common/keyboard/keyboard_ui.h', 78 'common/keyboard/keyboard_ui.h',
79 'common/keyboard/keyboard_ui_observer.h', 79 'common/keyboard/keyboard_ui_observer.h',
80 'common/login_status.h', 80 'common/login_status.h',
81 'common/material_design/material_design_controller.cc', 81 'common/material_design/material_design_controller.cc',
82 'common/material_design/material_design_controller.h', 82 'common/material_design/material_design_controller.h',
83 'common/metrics/user_metrics_action.h', 83 'common/metrics/user_metrics_action.h',
84 'common/multi_profile_uma.cc', 84 'common/multi_profile_uma.cc',
85 'common/multi_profile_uma.h', 85 'common/multi_profile_uma.h',
86 'common/pointer_down_watcher_delegate.h', 86 'common/pointer_watcher_delegate.h',
87 'common/popup_message.cc', 87 'common/popup_message.cc',
88 'common/popup_message.h', 88 'common/popup_message.h',
89 'common/root_window_controller_common.cc', 89 'common/root_window_controller_common.cc',
90 'common/root_window_controller_common.h', 90 'common/root_window_controller_common.h',
91 'common/session/session_state_delegate.cc', 91 'common/session/session_state_delegate.cc',
92 'common/session/session_state_delegate.h', 92 'common/session/session_state_delegate.h',
93 'common/session/session_state_observer.cc', 93 'common/session/session_state_observer.cc',
94 'common/session/session_state_observer.h', 94 'common/session/session_state_observer.h',
95 'common/session/session_types.h', 95 'common/session/session_types.h',
96 'common/shelf/app_list_button.cc', 96 'common/shelf/app_list_button.cc',
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 'magnifier/partial_magnification_controller.cc', 585 'magnifier/partial_magnification_controller.cc',
586 'magnifier/partial_magnification_controller.h', 586 'magnifier/partial_magnification_controller.h',
587 'metrics/desktop_task_switch_metric_recorder.cc', 587 'metrics/desktop_task_switch_metric_recorder.cc',
588 'metrics/desktop_task_switch_metric_recorder.h', 588 'metrics/desktop_task_switch_metric_recorder.h',
589 'metrics/task_switch_metrics_recorder.cc', 589 'metrics/task_switch_metrics_recorder.cc',
590 'metrics/task_switch_metrics_recorder.h', 590 'metrics/task_switch_metrics_recorder.h',
591 'metrics/task_switch_time_tracker.cc', 591 'metrics/task_switch_time_tracker.cc',
592 'metrics/task_switch_time_tracker.h', 592 'metrics/task_switch_time_tracker.h',
593 'metrics/user_metrics_recorder.cc', 593 'metrics/user_metrics_recorder.cc',
594 'metrics/user_metrics_recorder.h', 594 'metrics/user_metrics_recorder.h',
595 'pointer_down_watcher_delegate_aura.cc', 595 'pointer_watcher_delegate_aura.cc',
596 'pointer_down_watcher_delegate_aura.h', 596 'pointer_watcher_delegate_aura.h',
597 'root_window_controller.cc', 597 'root_window_controller.cc',
598 'root_window_controller.h', 598 'root_window_controller.h',
599 'root_window_settings.cc', 599 'root_window_settings.cc',
600 'root_window_settings.h', 600 'root_window_settings.h',
601 'rotator/screen_rotation_animation.cc', 601 'rotator/screen_rotation_animation.cc',
602 'rotator/screen_rotation_animation.h', 602 'rotator/screen_rotation_animation.h',
603 'rotator/screen_rotation_animator.cc', 603 'rotator/screen_rotation_animator.cc',
604 'rotator/screen_rotation_animator.h', 604 'rotator/screen_rotation_animator.h',
605 'rotator/window_rotation.cc', 605 'rotator/window_rotation.cc',
606 'rotator/window_rotation.h', 606 'rotator/window_rotation.h',
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1466 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1467 ], 1467 ],
1468 } 1468 }
1469 ], 1469 ],
1470 ], 1470 ],
1471 }, 1471 },
1472 ], 1472 ],
1473 }], 1473 }],
1474 ], 1474 ],
1475 } 1475 }
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698