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

Unified Diff: chrome/browser/ui/ash/cast_config_delegate_media_router.cc

Issue 1567103005: Replace base::CallbackList with base::ObserverList in CastConfigDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Add TODO for proper fix Created 4 years, 11 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 | « chrome/browser/ui/ash/cast_config_delegate_media_router.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/cast_config_delegate_media_router.cc
diff --git a/chrome/browser/ui/ash/cast_config_delegate_media_router.cc b/chrome/browser/ui/ash/cast_config_delegate_media_router.cc
index 350505d0c6d290e144bc85adad90c5c6062c1e1a..db84ed37587b533c7ad173037e3e47de13f863e0 100644
--- a/chrome/browser/ui/ash/cast_config_delegate_media_router.cc
+++ b/chrome/browser/ui/ash/cast_config_delegate_media_router.cc
@@ -136,12 +136,6 @@ bool CastConfigDelegateMediaRouter::HasCastExtension() const {
return true;
}
-CastConfigDelegateMediaRouter::DeviceUpdateSubscription
-CastConfigDelegateMediaRouter::RegisterDeviceUpdateObserver(
- const ReceiversAndActivitesCallback& callback) {
- return callback_list_.Add(callback);
-}
-
void CastConfigDelegateMediaRouter::RequestDeviceRefresh() {
// The media router component isn't ready yet.
if (!devices())
@@ -192,7 +186,8 @@ void CastConfigDelegateMediaRouter::RequestDeviceRefresh() {
}
}
- callback_list_.Notify(items);
+ FOR_EACH_OBSERVER(ash::CastConfigDelegate::Observer, observer_list_,
+ OnDevicesUpdated(items));
}
void CastConfigDelegateMediaRouter::CastToReceiver(
@@ -213,3 +208,13 @@ bool CastConfigDelegateMediaRouter::HasOptions() const {
}
void CastConfigDelegateMediaRouter::LaunchCastOptions() {}
+
+void CastConfigDelegateMediaRouter::AddObserver(
+ ash::CastConfigDelegate::Observer* observer) {
+ observer_list_.AddObserver(observer);
+}
+
+void CastConfigDelegateMediaRouter::RemoveObserver(
+ ash::CastConfigDelegate::Observer* observer) {
+ observer_list_.RemoveObserver(observer);
+}
« no previous file with comments | « chrome/browser/ui/ash/cast_config_delegate_media_router.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698