OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "ash/system/system_notifier.h" | 5 #include "ash/system/system_notifier.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 | 8 |
9 #if defined(OS_CHROMEOS) | 9 #if defined(OS_CHROMEOS) |
10 #include "ui/chromeos/network/network_state_notifier.h" | 10 #include "ui/chromeos/network/network_state_notifier.h" |
11 #endif | 11 #endif |
12 | 12 |
13 namespace ash { | 13 namespace ash { |
14 namespace system_notifier { | 14 namespace system_notifier { |
15 | 15 |
16 namespace { | 16 namespace { |
17 | 17 |
18 // See http://dev.chromium.org/chromium-os/chromiumos-design-docs/ | 18 // See http://dev.chromium.org/chromium-os/chromiumos-design-docs/ |
19 // system-notifications for the reasoning. | 19 // system-notifications for the reasoning. |
20 | 20 |
21 // |kAlwaysShownSystemNotifierIds| is the list of system notification sources | 21 // |kAlwaysShownSystemNotifierIds| is the list of system notification sources |
22 // which can appear regardless of the situation, such like login screen or lock | 22 // which can appear regardless of the situation, such like login screen or lock |
23 // screen. | 23 // screen. |
24 const char* kAlwaysShownSystemNotifierIds[] = { | 24 const char* kAlwaysShownSystemNotifierIds[] = { |
| 25 kNotifierDeprecatedAccelerator, |
25 kNotifierBattery, | 26 kNotifierBattery, |
26 kNotifierDisplay, | 27 kNotifierDisplay, |
27 kNotifierDisplayError, | 28 kNotifierDisplayError, |
28 #if defined(OS_CHROMEOS) | 29 #if defined(OS_CHROMEOS) |
29 ui::NetworkStateNotifier::kNotifierNetworkError, | 30 ui::NetworkStateNotifier::kNotifierNetworkError, |
30 #endif | 31 #endif |
31 kNotifierPower, | 32 kNotifierPower, |
32 // Note: Order doesn't matter here, so keep this in alphabetic order, don't | 33 // Note: Order doesn't matter here, so keep this in alphabetic order, don't |
33 // just add your stuff at the end! | 34 // just add your stuff at the end! |
34 NULL}; | 35 NULL}; |
(...skipping 28 matching lines...) Expand all Loading... |
63 if (notifier_id.id == id_list[i]) | 64 if (notifier_id.id == id_list[i]) |
64 return true; | 65 return true; |
65 } | 66 } |
66 return false; | 67 return false; |
67 } | 68 } |
68 | 69 |
69 } // namespace | 70 } // namespace |
70 | 71 |
71 const char kNotifierBattery[] = "ash.battery"; | 72 const char kNotifierBattery[] = "ash.battery"; |
72 const char kNotifierBluetooth[] = "ash.bluetooth"; | 73 const char kNotifierBluetooth[] = "ash.bluetooth"; |
| 74 const char kNotifierDeprecatedAccelerator[] = "ash.accelerator-controller"; |
73 const char kNotifierDisplay[] = "ash.display"; | 75 const char kNotifierDisplay[] = "ash.display"; |
74 const char kNotifierDisplayError[] = "ash.display.error"; | 76 const char kNotifierDisplayError[] = "ash.display.error"; |
75 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change"; | 77 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change"; |
76 const char kNotifierLocale[] = "ash.locale"; | 78 const char kNotifierLocale[] = "ash.locale"; |
77 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run"; | 79 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run"; |
78 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector"; | 80 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector"; |
79 const char kNotifierPower[] = "ash.power"; | 81 const char kNotifierPower[] = "ash.power"; |
80 const char kNotifierScreenshot[] = "ash.screenshot"; | 82 const char kNotifierScreenshot[] = "ash.screenshot"; |
81 const char kNotifierScreenCapture[] = "ash.screen-capture"; | 83 const char kNotifierScreenCapture[] = "ash.screen-capture"; |
82 const char kNotifierScreenShare[] = "ash.screen-share"; | 84 const char kNotifierScreenShare[] = "ash.screen-share"; |
83 const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout"; | 85 const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout"; |
84 const char kNotifierSupervisedUser[] = "ash.locally-managed-user"; | 86 const char kNotifierSupervisedUser[] = "ash.locally-managed-user"; |
85 | 87 |
86 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) { | 88 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) { |
87 return MatchSystemNotifierId(notifier_id, kAlwaysShownSystemNotifierIds); | 89 return MatchSystemNotifierId(notifier_id, kAlwaysShownSystemNotifierIds); |
88 } | 90 } |
89 | 91 |
90 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) { | 92 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) { |
91 return ShouldAlwaysShowPopups(notifier_id) || | 93 return ShouldAlwaysShowPopups(notifier_id) || |
92 MatchSystemNotifierId(notifier_id, kAshSystemNotifiers); | 94 MatchSystemNotifierId(notifier_id, kAshSystemNotifiers); |
93 } | 95 } |
94 | 96 |
95 } // namespace system_notifier | 97 } // namespace system_notifier |
96 } // namespace ash | 98 } // namespace ash |
OLD | NEW |