chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc - Issue 1173753003: [Media Router] Implement JoinRoute + update CreateRoute 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.cc

Issue 1173753003: [Media Router] Implement JoinRoute + update CreateRoute API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Compile fix again x2 Created 5 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

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

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

index a752f74739cec41c24c0a46815bee6325ab0c6b2..0381fe7deccf842f7475c45ebd6c2332b29588be 100644

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

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

@@ -175,10 +175,7 @@ void MediaRouterWebUIMessageHandler::OnGetInitialSettings(

initial_settings.Set("routes", routes.release());

scoped_ptr<base::ListValue> cast_modes(CastModesToValue(

- media_router_ui->cast_modes(),

- // TODO(imcheng): Use media_router_ui->source_host() once DEFAULT mode

- // is upstreamed.

- std::string()));

+ media_router_ui->cast_modes(), media_router_ui->GetFrameURLHost()));

initial_settings.Set("castModes", cast_modes.release());

web_ui()->CallJavascriptFunction(kSetInitialSettings, initial_settings);

« no previous file with comments | « chrome/browser/ui/webui/media_router/media_router_ui.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »