| Index: chrome/browser/ui/toolbar/media_router_action.h
|
| diff --git a/chrome/browser/ui/toolbar/media_router_action.h b/chrome/browser/ui/toolbar/media_router_action.h
|
| index 676a1f68b98eeb972d74e15cf5c2cb7bb8511866..16db2f548267f3c4e25128ee7bb42352896317c6 100644
|
| --- a/chrome/browser/ui/toolbar/media_router_action.h
|
| +++ b/chrome/browser/ui/toolbar/media_router_action.h
|
| @@ -9,6 +9,7 @@
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| +#include "base/optional.h"
|
| #include "base/scoped_observer.h"
|
| #include "chrome/browser/media/router/issues_observer.h"
|
| #include "chrome/browser/media/router/media_routes_observer.h"
|
| @@ -61,7 +62,8 @@ class MediaRouterAction : public ToolbarActionViewController,
|
| bool DisabledClickOpensMenu() const override;
|
|
|
| // media_router::IssuesObserver:
|
| - void OnIssueUpdated(const media_router::Issue* issue) override;
|
| + void OnIssue(const media_router::Issue& issue) override;
|
| + void OnIssuesCleared() override;
|
|
|
| // media_router::MediaRoutesObserver:
|
| void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes,
|
| @@ -111,9 +113,10 @@ class MediaRouterAction : public ToolbarActionViewController,
|
| // routes since |this| is an IssueObserver and MediaRoutesObserver.
|
| gfx::VectorIconId current_icon_;
|
|
|
| - // The current issue shown in the Media Router WebUI. Can be null. It is set
|
| - // in OnIssueUpdated(), which is called by the IssueManager.
|
| - std::unique_ptr<media_router::Issue> issue_;
|
| + // The current issue shown in the Media Router WebUI, or not set if there are
|
| + // no issues currently.
|
| + // Set in OnIssueUpdated(), which is called by the IssueManager.
|
| + base::Optional<media_router::IssueInfo> current_issue_;
|
|
|
| // Whether a local displayable active route exists.
|
| bool has_local_display_route_;
|
|
|