| Index: chrome/browser/media/router/mojo/media_route_controller.h
|
| diff --git a/chrome/browser/media/router/mojo/media_route_controller.h b/chrome/browser/media/router/mojo/media_route_controller.h
|
| index 5a5fab0bc132e11c94d9715cc02d71e9f550a224..cfc65cebc105983ea28c24b1887cf4b1c94e1be3 100644
|
| --- a/chrome/browser/media/router/mojo/media_route_controller.h
|
| +++ b/chrome/browser/media/router/mojo/media_route_controller.h
|
| @@ -52,6 +52,9 @@ class MediaRouteController : public mojom::MediaStatusObserver,
|
| return controller_;
|
| }
|
|
|
| + protected:
|
| + scoped_refptr<MediaRouteController> controller_;
|
| +
|
| private:
|
| friend class MediaRouteController;
|
|
|
| @@ -62,8 +65,6 @@ class MediaRouteController : public mojom::MediaStatusObserver,
|
| // disposed. Overridden by subclasses to do custom cleanup.
|
| virtual void OnControllerInvalidated();
|
|
|
| - scoped_refptr<MediaRouteController> controller_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(Observer);
|
| };
|
|
|
| @@ -96,6 +97,12 @@ class MediaRouteController : public mojom::MediaStatusObserver,
|
|
|
| MediaRoute::Id route_id() const { return route_id_; }
|
|
|
| + // Returns the latest media status that the controller has been notified with.
|
| + // Returns a nullopt if the controller hasn't been notified yet.
|
| + const base::Optional<MediaStatus>& current_media_status() const {
|
| + return current_media_status_;
|
| + }
|
| +
|
| protected:
|
| ~MediaRouteController() override;
|
|
|
| @@ -129,6 +136,9 @@ class MediaRouteController : public mojom::MediaStatusObserver,
|
| // This becomes false when the controller is invalidated.
|
| bool is_valid_ = true;
|
|
|
| + // The latest media status that the controller has been notified with.
|
| + base::Optional<MediaStatus> current_media_status_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(MediaRouteController);
|
| };
|
|
|
|
|