chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h - Issue 1415103006: Non-Local Join for Media Router and Presentation API

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 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Backwards Compatibility Created 4 years, 12 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

« chrome/browser/ui/webui/media_router/media_router_ui.h ('K') | « 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') | chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc » ('J')
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 af9074d40a026a41fe30982ed803c846928af7e4..d62716ddd5cf67f34b522fc1a8dd05abd8543a1f 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

@@ -32,7 +32,8 @@ 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);

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

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

void UpdateCastModes(const CastModeSet& cast_modes,

const std::string& source_host);

void OnCreateRouteResponseReceived(const MediaSink::Id& sink_id,

@@ -57,6 +58,7 @@ class MediaRouterWebUIMessageHandler : public content::WebUIMessageHandler {

void OnCreateRoute(const base::ListValue* args);

void OnActOnIssue(const base::ListValue* args);

void OnCloseRoute(const base::ListValue* args);

+ void OnJoinRoute(const base::ListValue* args);

void OnCloseDialog(const base::ListValue* args);

void OnReportSinkCount(const base::ListValue* args);

void OnInitialDataReceived(const base::ListValue* args);