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

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

Issue 1383653002: MediaRouterAction: Only observe Media Routes when there is a local route. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes per imcheng@'s comments. Created 5 years, 3 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/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 7900a70add99e6ade2acd4533608855bcdb560a8..8f5154531d3dbf0021f933bb4333707b663a26fe 100644
--- a/chrome/browser/ui/toolbar/media_router_action.h
+++ b/chrome/browser/ui/toolbar/media_router_action.h
@@ -7,7 +7,7 @@
#include "base/scoped_observer.h"
#include "chrome/browser/media/router/issues_observer.h"
-#include "chrome/browser/media/router/media_routes_observer.h"
+#include "chrome/browser/media/router/local_media_routes_observer.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/toolbar/media_router_contextual_menu.h"
#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
@@ -24,7 +24,7 @@ class MediaRouterDialogControllerImpl;
// the toolbar.
class MediaRouterAction : public ToolbarActionViewController,
public media_router::IssuesObserver,
- public media_router::MediaRoutesObserver,
+ public media_router::LocalMediaRoutesObserver,
public TabStripModelObserver {
public:
explicit MediaRouterAction(Browser* browser);
@@ -53,9 +53,8 @@ class MediaRouterAction : public ToolbarActionViewController,
// media_router::IssuesObserver:
void OnIssueUpdated(const media_router::Issue* issue) override;
- // media_router::MediaRoutesObserver:
- void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes)
- override;
+ // media_router::LocalMediaRoutesObserver:
+ void UpdateHasLocalRoute(bool has_local_route) override;
// ToolbarStripModelObserver:
void ActiveTabChanged(content::WebContents* old_contents,
@@ -66,6 +65,8 @@ class MediaRouterAction : public ToolbarActionViewController,
void OnPopupHidden();
void OnPopupShown();
+ void SetHasLocalRoute(bool has_local_route);
+
private:
void UpdatePopupState();
@@ -77,7 +78,6 @@ class MediaRouterAction : public ToolbarActionViewController,
GetMediaRouterDialogController();
// Overridden by tests.
- virtual media_router::MediaRouter* GetMediaRouter(Browser* browser);
virtual MediaRouterActionPlatformDelegate* GetPlatformDelegate();
// Checks if the current icon of MediaRouterAction has changed. If so,

Powered by Google App Engine
This is Rietveld 408576698