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

Unified Diff: ash/system/system_notifier.cc

Issue 1177773002: Deprecating high-conflict accelerators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oshima's comments Created 5 years, 3 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/system/system_notifier.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/system_notifier.cc
diff --git a/ash/system/system_notifier.cc b/ash/system/system_notifier.cc
index 6ff6dcb8375086e73843ac4f52fbce47c7b95073..8356a59076257a7c0da2456da1b3e5b753d8c818 100644
--- a/ash/system/system_notifier.cc
+++ b/ash/system/system_notifier.cc
@@ -22,6 +22,7 @@ namespace {
// which can appear regardless of the situation, such like login screen or lock
// screen.
const char* kAlwaysShownSystemNotifierIds[] = {
+ kNotifierDeprecatedAccelerator,
kNotifierBattery,
kNotifierDisplay,
kNotifierDisplayError,
@@ -70,6 +71,7 @@ bool MatchSystemNotifierId(const message_center::NotifierId& notifier_id,
const char kNotifierBattery[] = "ash.battery";
const char kNotifierBluetooth[] = "ash.bluetooth";
+const char kNotifierDeprecatedAccelerator[] = "ash.accelerator-controller";
const char kNotifierDisplay[] = "ash.display";
const char kNotifierDisplayError[] = "ash.display.error";
const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change";
« no previous file with comments | « ash/system/system_notifier.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698