Chromium Code Reviews| 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..00606842d1d9e91f1303504ec939b398c213f67e 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" |
| @@ -111,9 +112,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 severity of 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::Severity> current_issue_severity_; |
|
mark a. foltz
2016/10/18 21:13:44
It seems odd to cherry-pick one value out of the d
imcheng
2016/11/18 23:45:14
This was an issue before because of how we allocat
|
| // Whether a local displayable active route exists. |
| bool has_local_display_route_; |