Index: ash/system/system_notifier.cc |
diff --git a/ash/system/system_notifier.cc b/ash/system/system_notifier.cc |
index 766918619cc9f6e78c67ead370fbd20fc28c35a0..b8485fe8f1f77bd18aefd21070d5c2ef605a2c0d 100644 |
--- a/ash/system/system_notifier.cc |
+++ b/ash/system/system_notifier.cc |
@@ -26,7 +26,6 @@ const char* kAshSystemNotifiers[] = { |
kNotifierDisplayResolutionChange, |
kNotifierDisplayError, |
Pam (message me for reviews)
2014/07/17 16:48:47
Also this one (E < R)
Marc Treib
2014/07/18 08:07:06
Done.
|
kNotifierLocale, |
- kNotifierLocallyManagedUser, |
kNotifierMultiProfileFirstRun, |
kNotifierNetwork, |
kNotifierNetworkError, |
@@ -35,6 +34,7 @@ const char* kAshSystemNotifiers[] = { |
kNotifierScreenCapture, |
kNotifierScreenShare, |
kNotifierSessionLengthTimeout, |
+ kNotifierSupervisedUser, |
kNotifierPower, |
kNotifierBluetooth, |
Pam (message me for reviews)
2014/07/17 16:48:47
These last two too. And I think it's worth adding
Marc Treib
2014/07/18 08:07:06
Done.
|
NULL |
@@ -59,7 +59,6 @@ const char kNotifierDisplay[] = "ash.display"; |
const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change"; |
const char kNotifierDisplayError[] = "ash.display.error"; |
Pam (message me for reviews)
2014/07/17 16:48:47
E < R
Marc Treib
2014/07/18 08:07:06
Done.
|
const char kNotifierLocale[] = "ash.locale"; |
-const char kNotifierLocallyManagedUser[] = "ash.locally-managed-user"; |
const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run"; |
const char kNotifierNetwork[] = "ash.network"; |
const char kNotifierNetworkError[] = "ash.network.error"; |
@@ -69,6 +68,7 @@ const char kNotifierScreenshot[] = "ash.screenshot"; |
const char kNotifierScreenCapture[] = "ash.screen-capture"; |
const char kNotifierScreenShare[] = "ash.screen-share"; |
const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout"; |
+const char kNotifierSupervisedUser[] = "ash.locally-managed-user"; |
bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) { |
return MatchSystemNotifierId(notifier_id, kAlwaysShownNotifierIds); |