| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ui/message_center/message_center_impl.h" | 5 #include "ui/message_center/message_center_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <deque> | 8 #include <deque> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/memory/scoped_vector.h" | 11 #include "base/memory/scoped_vector.h" |
| 12 #include "base/observer_list.h" | 12 #include "base/observer_list.h" |
| 13 #include "base/stl_util.h" |
| 13 #include "ui/message_center/message_center_style.h" | 14 #include "ui/message_center/message_center_style.h" |
| 14 #include "ui/message_center/message_center_switches.h" | 15 #include "ui/message_center/message_center_switches.h" |
| 15 #include "ui/message_center/message_center_types.h" | 16 #include "ui/message_center/message_center_types.h" |
| 16 #include "ui/message_center/notification.h" | 17 #include "ui/message_center/notification.h" |
| 17 #include "ui/message_center/notification_blocker.h" | 18 #include "ui/message_center/notification_blocker.h" |
| 18 #include "ui/message_center/notification_list.h" | 19 #include "ui/message_center/notification_list.h" |
| 19 #include "ui/message_center/notification_types.h" | 20 #include "ui/message_center/notification_types.h" |
| 20 #include "ui/message_center/popup_timer.h" | 21 #include "ui/message_center/popup_timer.h" |
| 21 | 22 |
| 22 namespace message_center { | 23 namespace message_center { |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 | 375 |
| 375 void MessageCenterImpl::AddObserver(MessageCenterObserver* observer) { | 376 void MessageCenterImpl::AddObserver(MessageCenterObserver* observer) { |
| 376 observer_list_.AddObserver(observer); | 377 observer_list_.AddObserver(observer); |
| 377 } | 378 } |
| 378 | 379 |
| 379 void MessageCenterImpl::RemoveObserver(MessageCenterObserver* observer) { | 380 void MessageCenterImpl::RemoveObserver(MessageCenterObserver* observer) { |
| 380 observer_list_.RemoveObserver(observer); | 381 observer_list_.RemoveObserver(observer); |
| 381 } | 382 } |
| 382 | 383 |
| 383 void MessageCenterImpl::AddNotificationBlocker(NotificationBlocker* blocker) { | 384 void MessageCenterImpl::AddNotificationBlocker(NotificationBlocker* blocker) { |
| 384 if (std::find(blockers_.begin(), blockers_.end(), blocker) != | 385 if (ContainsValue(blockers_, blocker)) |
| 385 blockers_.end()) { | |
| 386 return; | 386 return; |
| 387 } | 387 |
| 388 blocker->AddObserver(this); | 388 blocker->AddObserver(this); |
| 389 blockers_.push_back(blocker); | 389 blockers_.push_back(blocker); |
| 390 } | 390 } |
| 391 | 391 |
| 392 void MessageCenterImpl::RemoveNotificationBlocker( | 392 void MessageCenterImpl::RemoveNotificationBlocker( |
| 393 NotificationBlocker* blocker) { | 393 NotificationBlocker* blocker) { |
| 394 std::vector<NotificationBlocker*>::iterator iter = | 394 std::vector<NotificationBlocker*>::iterator iter = |
| 395 std::find(blockers_.begin(), blockers_.end(), blocker); | 395 std::find(blockers_.begin(), blockers_.end(), blocker); |
| 396 if (iter == blockers_.end()) | 396 if (iter == blockers_.end()) |
| 397 return; | 397 return; |
| (...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 887 } | 887 } |
| 888 | 888 |
| 889 void MessageCenterImpl::EnableChangeQueueForTest(bool enable) { | 889 void MessageCenterImpl::EnableChangeQueueForTest(bool enable) { |
| 890 if (enable) | 890 if (enable) |
| 891 notification_queue_.reset(new internal::ChangeQueue()); | 891 notification_queue_.reset(new internal::ChangeQueue()); |
| 892 else | 892 else |
| 893 notification_queue_.reset(); | 893 notification_queue_.reset(); |
| 894 } | 894 } |
| 895 | 895 |
| 896 } // namespace message_center | 896 } // namespace message_center |
| OLD | NEW |