| 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/common/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 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 return MatchSystemNotifierId(notifier_id, kAlwaysShownSystemNotifierIds); | 93 return MatchSystemNotifierId(notifier_id, kAlwaysShownSystemNotifierIds); |
| 94 } | 94 } |
| 95 | 95 |
| 96 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) { | 96 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) { |
| 97 return ShouldAlwaysShowPopups(notifier_id) || | 97 return ShouldAlwaysShowPopups(notifier_id) || |
| 98 MatchSystemNotifierId(notifier_id, kAshSystemNotifiers); | 98 MatchSystemNotifierId(notifier_id, kAshSystemNotifiers); |
| 99 } | 99 } |
| 100 | 100 |
| 101 } // namespace system_notifier | 101 } // namespace system_notifier |
| 102 } // namespace ash | 102 } // namespace ash |
| OLD | NEW |