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

Side by Side Diff: ash/ash.gyp

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/shelf/shelf_widget.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) 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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 # These files lists are shared with the GN build. 9 # These files lists are shared with the GN build.
10 'ash_sources': [ 10 'ash_sources': [
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 'system/chromeos/brightness/brightness_controller_chromeos.h', 278 'system/chromeos/brightness/brightness_controller_chromeos.h',
279 'system/chromeos/brightness/tray_brightness.cc', 279 'system/chromeos/brightness/tray_brightness.cc',
280 'system/chromeos/brightness/tray_brightness.h', 280 'system/chromeos/brightness/tray_brightness.h',
281 'system/chromeos/enterprise/enterprise_domain_observer.h', 281 'system/chromeos/enterprise/enterprise_domain_observer.h',
282 'system/chromeos/enterprise/tray_enterprise.cc', 282 'system/chromeos/enterprise/tray_enterprise.cc',
283 'system/chromeos/enterprise/tray_enterprise.h', 283 'system/chromeos/enterprise/tray_enterprise.h',
284 'system/chromeos/keyboard_brightness_controller.cc', 284 'system/chromeos/keyboard_brightness_controller.cc',
285 'system/chromeos/keyboard_brightness_controller.h', 285 'system/chromeos/keyboard_brightness_controller.h',
286 'system/chromeos/label_tray_view.cc', 286 'system/chromeos/label_tray_view.cc',
287 'system/chromeos/label_tray_view.h', 287 'system/chromeos/label_tray_view.h',
288 'system/chromeos/managed/tray_locally_managed_user.cc',
289 'system/chromeos/managed/tray_locally_managed_user.h',
290 'system/chromeos/network/network_connect.cc', 288 'system/chromeos/network/network_connect.cc',
291 'system/chromeos/network/network_connect.h', 289 'system/chromeos/network/network_connect.h',
292 'system/chromeos/network/network_detailed_view.h', 290 'system/chromeos/network/network_detailed_view.h',
293 'system/chromeos/network/network_observer.h', 291 'system/chromeos/network/network_observer.h',
294 'system/chromeos/network/network_portal_detector_observer.h', 292 'system/chromeos/network/network_portal_detector_observer.h',
295 'system/chromeos/network/network_state_list_detailed_view.cc', 293 'system/chromeos/network/network_state_list_detailed_view.cc',
296 'system/chromeos/network/network_state_list_detailed_view.h', 294 'system/chromeos/network/network_state_list_detailed_view.h',
297 'system/chromeos/network/network_state_notifier.cc', 295 'system/chromeos/network/network_state_notifier.cc',
298 'system/chromeos/network/network_state_notifier.h', 296 'system/chromeos/network/network_state_notifier.h',
299 'system/chromeos/network/tray_network.cc', 297 'system/chromeos/network/tray_network.cc',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 'system/chromeos/session/logout_button_tray.h', 330 'system/chromeos/session/logout_button_tray.h',
333 'system/chromeos/session/logout_confirmation_controller.cc', 331 'system/chromeos/session/logout_confirmation_controller.cc',
334 'system/chromeos/session/logout_confirmation_controller.h', 332 'system/chromeos/session/logout_confirmation_controller.h',
335 'system/chromeos/session/logout_confirmation_dialog.cc', 333 'system/chromeos/session/logout_confirmation_dialog.cc',
336 'system/chromeos/session/logout_confirmation_dialog.h', 334 'system/chromeos/session/logout_confirmation_dialog.h',
337 'system/chromeos/session/session_length_limit_observer.h', 335 'system/chromeos/session/session_length_limit_observer.h',
338 'system/chromeos/session/tray_session_length_limit.cc', 336 'system/chromeos/session/tray_session_length_limit.cc',
339 'system/chromeos/session/tray_session_length_limit.h', 337 'system/chromeos/session/tray_session_length_limit.h',
340 'system/chromeos/settings/tray_settings.cc', 338 'system/chromeos/settings/tray_settings.cc',
341 'system/chromeos/settings/tray_settings.h', 339 'system/chromeos/settings/tray_settings.h',
340 'system/chromeos/supervised/tray_supervised_user.cc',
341 'system/chromeos/supervised/tray_supervised_user.h',
342 'system/chromeos/system_clock_observer.cc', 342 'system/chromeos/system_clock_observer.cc',
343 'system/chromeos/system_clock_observer.h', 343 'system/chromeos/system_clock_observer.h',
344 'system/chromeos/tray_caps_lock.cc', 344 'system/chromeos/tray_caps_lock.cc',
345 'system/chromeos/tray_caps_lock.h', 345 'system/chromeos/tray_caps_lock.h',
346 'system/chromeos/tray_display.cc', 346 'system/chromeos/tray_display.cc',
347 'system/chromeos/tray_display.h', 347 'system/chromeos/tray_display.h',
348 'system/chromeos/tray_tracing.cc', 348 'system/chromeos/tray_tracing.cc',
349 'system/chromeos/tray_tracing.h', 349 'system/chromeos/tray_tracing.h',
350 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc', 350 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc',
351 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.h', 351 'system/chromeos/virtual_keyboard/virtual_keyboard_tray.h',
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 'shelf/shelf_navigator_unittest.cc', 792 'shelf/shelf_navigator_unittest.cc',
793 'shelf/shelf_tooltip_manager_unittest.cc', 793 'shelf/shelf_tooltip_manager_unittest.cc',
794 'shelf/shelf_unittest.cc', 794 'shelf/shelf_unittest.cc',
795 'shelf/shelf_view_unittest.cc', 795 'shelf/shelf_view_unittest.cc',
796 'shelf/shelf_widget_unittest.cc', 796 'shelf/shelf_widget_unittest.cc',
797 'shelf/shelf_window_watcher_unittest.cc', 797 'shelf/shelf_window_watcher_unittest.cc',
798 'shell_unittest.cc', 798 'shell_unittest.cc',
799 'sticky_keys/sticky_keys_overlay_unittest.cc', 799 'sticky_keys/sticky_keys_overlay_unittest.cc',
800 'sticky_keys/sticky_keys_unittest.cc', 800 'sticky_keys/sticky_keys_unittest.cc',
801 'system/chromeos/brightness/tray_brightness_unittest.cc', 801 'system/chromeos/brightness/tray_brightness_unittest.cc',
802 'system/chromeos/managed/tray_locally_managed_user_unittest.cc',
803 'system/chromeos/network/network_state_notifier_unittest.cc', 802 'system/chromeos/network/network_state_notifier_unittest.cc',
804 'system/chromeos/power/power_event_observer_unittest.cc', 803 'system/chromeos/power/power_event_observer_unittest.cc',
805 'system/chromeos/power/power_status_unittest.cc', 804 'system/chromeos/power/power_status_unittest.cc',
806 'system/chromeos/power/power_status_view_unittest.cc', 805 'system/chromeos/power/power_status_view_unittest.cc',
807 'system/chromeos/power/tray_power_unittest.cc', 806 'system/chromeos/power/tray_power_unittest.cc',
808 'system/chromeos/rotation/tray_rotation_lock_unittest.cc', 807 'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
809 'system/chromeos/screen_security/screen_tray_item_unittest.cc', 808 'system/chromeos/screen_security/screen_tray_item_unittest.cc',
810 'system/chromeos/session/logout_confirmation_controller_unittest.cc', 809 'system/chromeos/session/logout_confirmation_controller_unittest.cc',
811 'system/chromeos/session/tray_session_length_limit_unittest.cc', 810 'system/chromeos/session/tray_session_length_limit_unittest.cc',
811 'system/chromeos/supervised/tray_supervised_user_unittest.cc',
812 'system/chromeos/tray_display_unittest.cc', 812 'system/chromeos/tray_display_unittest.cc',
813 'system/date/date_view_unittest.cc', 813 'system/date/date_view_unittest.cc',
814 'system/overview/overview_button_tray_unittest.cc', 814 'system/overview/overview_button_tray_unittest.cc',
815 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc', 815 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
816 'system/tray/system_tray_unittest.cc', 816 'system/tray/system_tray_unittest.cc',
817 'system/tray/tray_details_view_unittest.cc', 817 'system/tray/tray_details_view_unittest.cc',
818 'system/user/tray_user_unittest.cc', 818 'system/user/tray_user_unittest.cc',
819 'system/web_notification/ash_popup_alignment_delegate_unittest.cc', 819 'system/web_notification/ash_popup_alignment_delegate_unittest.cc',
820 'system/web_notification/web_notification_tray_unittest.cc', 820 'system/web_notification/web_notification_tray_unittest.cc',
821 'test/ash_test_helper_unittest.cc', 821 'test/ash_test_helper_unittest.cc',
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 'conditions': [ 1244 'conditions': [
1245 ['chromeos==1', { 1245 ['chromeos==1', {
1246 'dependencies': [ 1246 'dependencies': [
1247 '../ui/display/display.gyp:display', 1247 '../ui/display/display.gyp:display',
1248 ], 1248 ],
1249 }], 1249 }],
1250 ], 1250 ],
1251 }, 1251 },
1252 ], 1252 ],
1253 } 1253 }
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698