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

Unified Diff: chrome/browser/ui/toolbar/media_router_action.h

Issue 2176613003: [Media Router] Clean up issues related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 4 years 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/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..14564a59e80ef7f90eb5412518c6bdd9d2c3899d 100644
--- a/chrome/browser/ui/toolbar/media_router_action.h
+++ b/chrome/browser/ui/toolbar/media_router_action.h
@@ -61,7 +61,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 +112,9 @@ 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, set in OnIssue() and
+ // cleared in OnIssuesCleared().
+ std::unique_ptr<media_router::IssueInfo> current_issue_;
// Whether a local displayable active route exists.
bool has_local_display_route_;
« no previous file with comments | « chrome/browser/resources/media_router/media_router_ui_interface.js ('k') | chrome/browser/ui/toolbar/media_router_action.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698