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

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

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
Index: chrome/browser/ui/ash/cast_config_delegate_media_router.h
diff --git a/chrome/browser/ui/ash/cast_config_delegate_media_router.h b/chrome/browser/ui/ash/cast_config_delegate_media_router.h
index f1beae8ee2da4dce9f528144e89f31807ba1c5c1..3799c1ff2a9438a26721a0a74e6e8e4035e3b5eb 100644
--- a/chrome/browser/ui/ash/cast_config_delegate_media_router.h
+++ b/chrome/browser/ui/ash/cast_config_delegate_media_router.h
@@ -7,6 +7,7 @@
#include "ash/cast_config_delegate.h"
#include "base/macros.h"
+#include "base/observer_list.h"
namespace media_router {
class MediaRouter;
@@ -28,20 +29,20 @@ class CastConfigDelegateMediaRouter : public ash::CastConfigDelegate {
private:
// CastConfigDelegate:
bool HasCastExtension() const override;
- DeviceUpdateSubscription RegisterDeviceUpdateObserver(
- const ReceiversAndActivitesCallback& callback) override;
void RequestDeviceRefresh() override;
void CastToReceiver(const std::string& receiver_id) override;
void StopCasting(const std::string& route_id) override;
bool HasOptions() const override;
void LaunchCastOptions() override;
+ void AddObserver(ash::CastConfigDelegate::Observer* observer) override;
+ void RemoveObserver(ash::CastConfigDelegate::Observer* observer) override;
// |devices_| stores the current source/route status that we query from.
// This will return null until the media router is initialized.
CastDeviceCache* devices();
scoped_ptr<CastDeviceCache> devices_;
- base::CallbackList<void(const ReceiversAndActivities&)> callback_list_;
+ base::ObserverList<ash::CastConfigDelegate::Observer> observer_list_;
DISALLOW_COPY_AND_ASSIGN(CastConfigDelegateMediaRouter);
};
« no previous file with comments | « chrome/browser/ui/ash/cast_config_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/cast_config_delegate_media_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698