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

Side by Side Diff: ash/ash.gyp

Issue 2126963002: mash: Move multi_profile_uma.* to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. 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 | « ash/accelerators/accelerator_controller.cc ('k') | ash/common/multi_profile_uma.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.cc', 10 'accelerators/accelerator_commands.cc',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 'common/display/display_info.h', 68 'common/display/display_info.h',
69 'common/focus_cycler.cc', 69 'common/focus_cycler.cc',
70 'common/focus_cycler.h', 70 'common/focus_cycler.h',
71 'common/keyboard/keyboard_ui.cc', 71 'common/keyboard/keyboard_ui.cc',
72 'common/keyboard/keyboard_ui.h', 72 'common/keyboard/keyboard_ui.h',
73 'common/keyboard/keyboard_ui_observer.h', 73 'common/keyboard/keyboard_ui_observer.h',
74 'common/login_status.h', 74 'common/login_status.h',
75 'common/material_design/material_design_controller.cc', 75 'common/material_design/material_design_controller.cc',
76 'common/material_design/material_design_controller.h', 76 'common/material_design/material_design_controller.h',
77 'common/metrics/user_metrics_action.h', 77 'common/metrics/user_metrics_action.h',
78 'common/multi_profile_uma.cc',
79 'common/multi_profile_uma.h',
78 'common/root_window_controller_common.cc', 80 'common/root_window_controller_common.cc',
79 'common/root_window_controller_common.h', 81 'common/root_window_controller_common.h',
80 'common/session/session_state_delegate.cc', 82 'common/session/session_state_delegate.cc',
81 'common/session/session_state_delegate.h', 83 'common/session/session_state_delegate.h',
82 'common/session/session_state_observer.cc', 84 'common/session/session_state_observer.cc',
83 'common/session/session_state_observer.h', 85 'common/session/session_state_observer.h',
84 'common/session/session_types.h', 86 'common/session/session_types.h',
85 'common/shelf/shelf_alignment_menu.cc', 87 'common/shelf/shelf_alignment_menu.cc',
86 'common/shelf/shelf_alignment_menu.h', 88 'common/shelf/shelf_alignment_menu.h',
87 'common/shelf/shelf_constants.cc', 89 'common/shelf/shelf_constants.cc',
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 'magnifier/partial_magnification_controller.cc', 526 'magnifier/partial_magnification_controller.cc',
525 'magnifier/partial_magnification_controller.h', 527 'magnifier/partial_magnification_controller.h',
526 'metrics/desktop_task_switch_metric_recorder.cc', 528 'metrics/desktop_task_switch_metric_recorder.cc',
527 'metrics/desktop_task_switch_metric_recorder.h', 529 'metrics/desktop_task_switch_metric_recorder.h',
528 'metrics/task_switch_metrics_recorder.cc', 530 'metrics/task_switch_metrics_recorder.cc',
529 'metrics/task_switch_metrics_recorder.h', 531 'metrics/task_switch_metrics_recorder.h',
530 'metrics/task_switch_time_tracker.cc', 532 'metrics/task_switch_time_tracker.cc',
531 'metrics/task_switch_time_tracker.h', 533 'metrics/task_switch_time_tracker.h',
532 'metrics/user_metrics_recorder.cc', 534 'metrics/user_metrics_recorder.cc',
533 'metrics/user_metrics_recorder.h', 535 'metrics/user_metrics_recorder.h',
534 'multi_profile_uma.cc',
535 'multi_profile_uma.h',
536 'pointer_watcher_delegate.h', 536 'pointer_watcher_delegate.h',
537 'pointer_watcher_delegate_aura.cc', 537 'pointer_watcher_delegate_aura.cc',
538 'pointer_watcher_delegate_aura.h', 538 'pointer_watcher_delegate_aura.h',
539 'popup_message.cc', 539 'popup_message.cc',
540 'popup_message.h', 540 'popup_message.h',
541 'root_window_controller.cc', 541 'root_window_controller.cc',
542 'root_window_controller.h', 542 'root_window_controller.h',
543 'root_window_settings.cc', 543 'root_window_settings.cc',
544 'root_window_settings.h', 544 'root_window_settings.h',
545 'rotator/screen_rotation_animation.cc', 545 'rotator/screen_rotation_animation.cc',
(...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1450 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1451 ], 1451 ],
1452 } 1452 }
1453 ], 1453 ],
1454 ], 1454 ],
1455 }, 1455 },
1456 ], 1456 ],
1457 }], 1457 }],
1458 ], 1458 ],
1459 } 1459 }
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/common/multi_profile_uma.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698