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

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

Issue 1605133002: [Media Router] Handle route creation where resolved route is not for display. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes per imcheng@'s comments. Created 4 years, 11 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 558392be1ab906683cf1dcc77d5e3ce185a2af91..a8e238fac7ee42af9d467fa75db57391d618ffb5 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
@@ -41,6 +41,7 @@ const char kReportClickedSinkIndex[] = "reportClickedSinkIndex";
const char kReportInitialAction[] = "reportInitialAction";
const char kReportInitialState[] = "reportInitialState";
const char kReportNavigateToView[] = "reportNavigateToView";
+const char kReportRouteCreation[] = "reportRouteCreation";
const char kReportSelectedCastMode[] = "reportSelectedCastMode";
const char kReportSinkCount[] = "reportSinkCount";
const char kReportTimeToClickSink[] = "reportTimeToClickSink";
@@ -222,22 +223,11 @@ void MediaRouterWebUIMessageHandler::UpdateCastModes(
void MediaRouterWebUIMessageHandler::OnCreateRouteResponseReceived(
const MediaSink::Id& sink_id,
- const MediaRoute* route) {
+ const MediaRoute::Id& route_id) {
DVLOG(2) << "OnCreateRouteResponseReceived";
- if (route) {
- scoped_ptr<base::DictionaryValue> route_value(RouteToValue(*route, false,
- media_router_ui_->GetRouteProviderExtensionId()));
- web_ui()->CallJavascriptFunction(kOnCreateRouteResponseReceived,
- base::StringValue(sink_id), *route_value);
- UMA_HISTOGRAM_BOOLEAN("MediaRouter.Ui.Action.StartLocalSessionSuccessful",
- true);
- } else {
- web_ui()->CallJavascriptFunction(kOnCreateRouteResponseReceived,
- base::StringValue(sink_id),
- *base::Value::CreateNullValue());
- UMA_HISTOGRAM_BOOLEAN("MediaRouter.Ui.Action.StartLocalSessionSuccessful",
- false);
- }
+ web_ui()->CallJavascriptFunction(kOnCreateRouteResponseReceived,
+ base::StringValue(sink_id),
+ base::StringValue(route_id));
}
void MediaRouterWebUIMessageHandler::UpdateIssue(const Issue* issue) {
@@ -299,6 +289,10 @@ void MediaRouterWebUIMessageHandler::RegisterMessages() {
base::Bind(&MediaRouterWebUIMessageHandler::OnReportInitialAction,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
+ kReportRouteCreation,
+ base::Bind(&MediaRouterWebUIMessageHandler::OnReportRouteCreation,
+ base::Unretained(this)));
+ web_ui()->RegisterMessageCallback(
kReportSelectedCastMode,
base::Bind(&MediaRouterWebUIMessageHandler::OnReportSelectedCastMode,
base::Unretained(this)));
@@ -567,6 +561,19 @@ void MediaRouterWebUIMessageHandler::OnReportNavigateToView(
}
}
+void MediaRouterWebUIMessageHandler::OnReportRouteCreation(
+ const base::ListValue* args) {
+ DVLOG(1) << "OnReportRouteCreation";
+ bool route_created_successfully;
+ if (!args->GetBoolean(0, &route_created_successfully)) {
+ DVLOG(1) << "Unable to extract args.";
+ return;
+ }
+
+ UMA_HISTOGRAM_BOOLEAN("MediaRouter.Ui.Action.StartLocalSessionSuccessful",
+ route_created_successfully);
+}
+
void MediaRouterWebUIMessageHandler::OnReportSelectedCastMode(
const base::ListValue* args) {
DVLOG(1) << "OnReportSelectedCastMode";

Powered by Google App Engine
This is Rietveld 408576698