chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h - Issue 2040873002: [Media Router] Assign each route a current cast mode if possible

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h

Issue 2040873002: [Media Router] Assign each route a current cast mode if possible (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« no previous file with comments | « chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc ('k') | chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h

diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h

index 62c193a7e573a96bfd468b33b853772436979afa..85168eef5d0d18429108512c83db420fef47c82f 100644

--- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h

+++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h

@@ -39,7 +39,9 @@ class MediaRouterWebUIMessageHandler : public content::WebUIMessageHandler {

// Methods to update the status displayed by the dialog.

void UpdateSinks(const std::vector<MediaSinkWithCastModes>& sinks);

void UpdateRoutes(const std::vector<MediaRoute>& routes,

- const std::vector<MediaRoute::Id>& joinable_route_ids);

+ const std::vector<MediaRoute::Id>& joinable_route_ids,

+ const std::unordered_map<MediaRoute::Id, MediaCastMode>&

+ current_cast_modes);

void UpdateCastModes(const CastModeSet& cast_modes,

const std::string& source_host);

void OnCreateRouteResponseReceived(const MediaSink::Id& sink_id,

@@ -102,7 +104,9 @@ class MediaRouterWebUIMessageHandler : public content::WebUIMessageHandler {

// passed to WebUI.

std::unique_ptr<base::ListValue> RoutesToValue(

const std::vector<MediaRoute>& routes,

- const std::vector<MediaRoute::Id>& joinable_route_ids) const;

+ const std::vector<MediaRoute::Id>& joinable_route_ids,

+ const std::unordered_map<MediaRoute::Id, MediaCastMode>&

+ current_cast_modes) const;

// Retrieve the account info for email and domain of signed in users. This is

// used when updating sinks to determine if identity should be displayed.