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

Side by Side Diff: ash/ash.gyp

Issue 14587007: Unify and change logout/sleep/lock shortcuts (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: review Created 7 years, 7 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/exit_warning_handler.cc ('k') | ash/ash_strings.grd » ('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 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 'sources': [ 49 'sources': [
50 # All .cc, .h under ash, except unittests 50 # All .cc, .h under ash, except unittests
51 'accelerators/accelerator_controller.cc', 51 'accelerators/accelerator_controller.cc',
52 'accelerators/accelerator_controller.h', 52 'accelerators/accelerator_controller.h',
53 'accelerators/accelerator_dispatcher.cc', 53 'accelerators/accelerator_dispatcher.cc',
54 'accelerators/accelerator_dispatcher.h', 54 'accelerators/accelerator_dispatcher.h',
55 'accelerators/accelerator_filter.cc', 55 'accelerators/accelerator_filter.cc',
56 'accelerators/accelerator_filter.h', 56 'accelerators/accelerator_filter.h',
57 'accelerators/accelerator_table.cc', 57 'accelerators/accelerator_table.cc',
58 'accelerators/accelerator_table.h', 58 'accelerators/accelerator_table.h',
59 'accelerators/exit_warning_handler.cc',
60 'accelerators/exit_warning_handler.h',
59 'accelerators/focus_manager_factory.cc', 61 'accelerators/focus_manager_factory.cc',
60 'accelerators/focus_manager_factory.h', 62 'accelerators/focus_manager_factory.h',
61 'accelerators/nested_dispatcher_controller.cc', 63 'accelerators/nested_dispatcher_controller.cc',
62 'accelerators/nested_dispatcher_controller.h', 64 'accelerators/nested_dispatcher_controller.h',
63 'ash_constants.cc', 65 'ash_constants.cc',
64 'ash_constants.h', 66 'ash_constants.h',
65 'ash_root_window_transformer.cc', 67 'ash_root_window_transformer.cc',
66 'ash_root_window_transformer.h', 68 'ash_root_window_transformer.h',
67 'ash_switches.cc', 69 'ash_switches.cc',
68 'ash_switches.h', 70 'ash_switches.h',
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 'shell_window_ids.h', 184 'shell_window_ids.h',
183 'system/bluetooth/bluetooth_observer.h', 185 'system/bluetooth/bluetooth_observer.h',
184 'system/bluetooth/tray_bluetooth.cc', 186 'system/bluetooth/tray_bluetooth.cc',
185 'system/bluetooth/tray_bluetooth.h', 187 'system/bluetooth/tray_bluetooth.h',
186 'system/brightness/brightness_observer.h', 188 'system/brightness/brightness_observer.h',
187 'system/brightness/brightness_control_delegate.h', 189 'system/brightness/brightness_control_delegate.h',
188 'system/brightness/tray_brightness.cc', 190 'system/brightness/tray_brightness.cc',
189 'system/brightness/tray_brightness.h', 191 'system/brightness/tray_brightness.h',
190 'system/chromeos/audio/audio_observer.h', 192 'system/chromeos/audio/audio_observer.h',
191 'system/chromeos/audio/tray_audio.cc', 193 'system/chromeos/audio/tray_audio.cc',
192 'system/chromeos/audio/tray_audio.h', 194 'system/chromeos/audio/tray_audio.h',
193 'system/chromeos/enterprise/enterprise_domain_observer.h', 195 'system/chromeos/enterprise/enterprise_domain_observer.h',
194 'system/chromeos/enterprise/tray_enterprise.h', 196 'system/chromeos/enterprise/tray_enterprise.h',
195 'system/chromeos/enterprise/tray_enterprise.cc', 197 'system/chromeos/enterprise/tray_enterprise.cc',
196 'system/chromeos/keyboard_brightness_controller.cc', 198 'system/chromeos/keyboard_brightness_controller.cc',
197 'system/chromeos/keyboard_brightness_controller.h', 199 'system/chromeos/keyboard_brightness_controller.h',
198 'system/chromeos/label_tray_view.h', 200 'system/chromeos/label_tray_view.h',
199 'system/chromeos/label_tray_view.cc', 201 'system/chromeos/label_tray_view.cc',
200 'system/chromeos/managed/tray_locally_managed_user.h', 202 'system/chromeos/managed/tray_locally_managed_user.h',
201 'system/chromeos/managed/tray_locally_managed_user.cc', 203 'system/chromeos/managed/tray_locally_managed_user.cc',
202 'system/chromeos/network/network_detailed_view.h', 204 'system/chromeos/network/network_detailed_view.h',
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 ], 496 ],
495 'conditions': [ 497 'conditions': [
496 ['OS=="mac"', { 498 ['OS=="mac"', {
497 'sources/': [ 499 'sources/': [
498 ['exclude', 'accelerators/accelerator_controller.cc'], 500 ['exclude', 'accelerators/accelerator_controller.cc'],
499 ['exclude', 'accelerators/accelerator_controller.h'], 501 ['exclude', 'accelerators/accelerator_controller.h'],
500 ['exclude', 'accelerators/accelerator_dispatcher.cc'], 502 ['exclude', 'accelerators/accelerator_dispatcher.cc'],
501 ['exclude', 'accelerators/accelerator_dispatcher.h'], 503 ['exclude', 'accelerators/accelerator_dispatcher.h'],
502 ['exclude', 'accelerators/accelerator_filter.cc'], 504 ['exclude', 'accelerators/accelerator_filter.cc'],
503 ['exclude', 'accelerators/accelerator_filter.h'], 505 ['exclude', 'accelerators/accelerator_filter.h'],
506 ['exclude', 'accelerators/exit_warning_handler.cc'],
507 ['exclude', 'accelerators/exit_warning_handler.h'],
504 ['exclude', 'accelerators/nested_dispatcher_controller.cc'], 508 ['exclude', 'accelerators/nested_dispatcher_controller.cc'],
505 ['exclude', 'accelerators/nested_dispatcher_controller.h'], 509 ['exclude', 'accelerators/nested_dispatcher_controller.h'],
506 ], 510 ],
507 }], 511 }],
508 ['OS=="win"', { 512 ['OS=="win"', {
509 'sources/': [ 513 'sources/': [
510 ['exclude', 'host/root_window_host_factory.cc'], 514 ['exclude', 'host/root_window_host_factory.cc'],
511 ], 515 ],
512 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 516 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
513 'msvs_disabled_warnings': [ 4267, ], 517 'msvs_disabled_warnings': [ 4267, ],
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 'shell/cocoa/app-Info.plist', 851 'shell/cocoa/app-Info.plist',
848 ], 852 ],
849 'xcode_settings': { 853 'xcode_settings': {
850 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 854 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
851 }, 855 },
852 }], 856 }],
853 ], 857 ],
854 }, 858 },
855 ], 859 ],
856 } 860 }
OLDNEW
« no previous file with comments | « ash/accelerators/exit_warning_handler.cc ('k') | ash/ash_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698