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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/accelerators/exit_warning_handler.cc ('k') | ash/ash_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 14ab3670e565b21a3a1246e2614b71f220513c0e..833ab2bd537b7853256f1300ece8e8ff9e73d1e9 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -56,6 +56,8 @@
'accelerators/accelerator_filter.h',
'accelerators/accelerator_table.cc',
'accelerators/accelerator_table.h',
+ 'accelerators/exit_warning_handler.cc',
+ 'accelerators/exit_warning_handler.h',
'accelerators/focus_manager_factory.cc',
'accelerators/focus_manager_factory.h',
'accelerators/nested_dispatcher_controller.cc',
@@ -189,7 +191,7 @@
'system/brightness/tray_brightness.h',
'system/chromeos/audio/audio_observer.h',
'system/chromeos/audio/tray_audio.cc',
- 'system/chromeos/audio/tray_audio.h',
+ 'system/chromeos/audio/tray_audio.h',
'system/chromeos/enterprise/enterprise_domain_observer.h',
'system/chromeos/enterprise/tray_enterprise.h',
'system/chromeos/enterprise/tray_enterprise.cc',
@@ -501,6 +503,8 @@
['exclude', 'accelerators/accelerator_dispatcher.h'],
['exclude', 'accelerators/accelerator_filter.cc'],
['exclude', 'accelerators/accelerator_filter.h'],
+ ['exclude', 'accelerators/exit_warning_handler.cc'],
+ ['exclude', 'accelerators/exit_warning_handler.h'],
['exclude', 'accelerators/nested_dispatcher_controller.cc'],
['exclude', 'accelerators/nested_dispatcher_controller.h'],
],
« 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