Non-Local Join for Media Router and Presentation API

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace media_router {
 
 namespace {
 
 const char kHelpPageUrlPrefix[] =
     "https://support.google.com/chromecast/answer/%d";
 
 // Message names.
 const char kRequestInitialData[] = "requestInitialData";
 const char kCreateRoute[] = "requestRoute";
 const char kActOnIssue[] = "actOnIssue";
 const char kCloseRoute[] = "closeRoute";
+const char kJoinRoute[] = "joinRoute";
 const char kCloseDialog[] = "closeDialog";
 const char kReportSinkCount[] = "reportSinkCount";
 
 // JS function names.
 const char kSetInitialData[] = "media_router.ui.setInitialData";
 const char kNotifyRouteCreationTimeout[] =
     "media_router.ui.onNotifyRouteCreationTimeout";
 const char kOnCreateRouteResponseReceived[] =
     "media_router.ui.onCreateRouteResponseReceived";
 const char kSetIssue[] = "media_router.ui.setIssue";
@@ skipping 132 matching lines @@
 }
 
 void MediaRouterWebUIMessageHandler::UpdateSinks(
     const std::vector<MediaSinkWithCastModes>& sinks) {
   DVLOG(2) << "UpdateSinks";
   scoped_ptr<base::ListValue> sinks_val(SinksToValue(sinks));
   web_ui()->CallJavascriptFunction(kSetSinkList, *sinks_val);
 }
 
 void MediaRouterWebUIMessageHandler::UpdateRoutes(
-    const std::vector<MediaRoute>& routes) {
-  DVLOG(2) << "UpdateRoutes";
+    const std::vector<MediaRoute>& routes,
+    const std::vector<MediaRoute>& joinable_routes) {
   scoped_ptr<base::ListValue> routes_val(RoutesToValue(routes,
       media_router_ui_->GetRouteProviderExtensionId()));
-  web_ui()->CallJavascriptFunction(kSetRouteList, *routes_val);
+  scoped_ptr<base::ListValue> joinable_routes_val(
+      RoutesToValue(joinable_routes,
+          media_router_ui_->GetRouteProviderExtensionId()));
+  web_ui()->CallJavascriptFunction(
+      kSetRouteList, *routes_val, *joinable_routes_val);
 }
 
 void MediaRouterWebUIMessageHandler::UpdateCastModes(
     const CastModeSet& cast_modes,
     const std::string& source_host) {
   DVLOG(2) << "UpdateCastModes";
   scoped_ptr<base::ListValue> cast_modes_val(
       CastModesToValue(cast_modes, source_host));
   web_ui()->CallJavascriptFunction(kSetCastModeList, *cast_modes_val);
 }
@@ skipping 45 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       kActOnIssue,
       base::Bind(&MediaRouterWebUIMessageHandler::OnActOnIssue,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       kCloseRoute,
       base::Bind(&MediaRouterWebUIMessageHandler::OnCloseRoute,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
+      kJoinRoute,
+      base::Bind(&MediaRouterWebUIMessageHandler::OnJoinRoute,
+                 base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
       kCloseDialog,
       base::Bind(&MediaRouterWebUIMessageHandler::OnCloseDialog,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       kReportSinkCount,
       base::Bind(&MediaRouterWebUIMessageHandler::OnReportSinkCount,
                  base::Unretained(this)));
 }
 
 void MediaRouterWebUIMessageHandler::OnRequestInitialData(
     const base::ListValue* args) {
   DVLOG(1) << "OnRequestInitialData";
   base::DictionaryValue initial_data;
 
   // "No Cast devices found?" Chromecast help center page.
   initial_data.SetString("deviceMissingUrl",
       base::StringPrintf(kHelpPageUrlPrefix, 3249268));
 
   scoped_ptr<base::ListValue> sinks(SinksToValue(media_router_ui_->sinks()));
   initial_data.Set("sinks", sinks.release());
 
   scoped_ptr<base::ListValue> routes(RoutesToValue(media_router_ui_->routes(),
       media_router_ui_->GetRouteProviderExtensionId()));
   initial_data.Set("routes", routes.release());
 
+
+  scoped_ptr<base::ListValue> joinable_routes(
+      RoutesToValue(media_router_ui_->joinable_routes(),
+        media_router_ui_->GetRouteProviderExtensionId()));
+  initial_data.Set("joinableRoutes", joinable_routes.release());
+
   const std::set<MediaCastMode> cast_modes = media_router_ui_->cast_modes();
   scoped_ptr<base::ListValue> cast_modes_list(
       CastModesToValue(cast_modes, media_router_ui_->GetFrameURLHost()));
   initial_data.Set("castModes", cast_modes_list.release());
   if (!cast_modes.empty()) {
     initial_data.SetInteger("initialCastModeType",
                             GetPreferredCastMode(cast_modes));
   }
 
   web_ui()->CallJavascriptFunction(kSetInitialData, initial_data);
@@ skipping 66 matching lines @@
     DVLOG(1) << "Invalid action type: " << action_type_num;
     return;
   }
   IssueAction::Type action_type =
       static_cast<IssueAction::Type>(action_type_num);
   if (ActOnIssueType(action_type, args_dict))
     DVLOG(1) << "ActOnIssueType failed for Issue ID " << issue_id;
   media_router_ui_->ClearIssue(issue_id);
 }
 
-void MediaRouterWebUIMessageHandler::OnCloseRoute(
-    const base::ListValue* args) {
+void MediaRouterWebUIMessageHandler::OnJoinRoute(const base::ListValue* args) {
+  DVLOG(1) << "OnJoinRoute";
+  const base::DictionaryValue* args_dict = nullptr;
+  std::string route_id;
+  std::string sink_id;
+  if (!args->GetDictionary(0, &args_dict) ||
+      !args_dict->GetString("sinkId", &sink_id) ||
+      !args_dict->GetString("routeId", &route_id)) {
+    DVLOG(1) << "Unable to extract args.";
+    return;
+  }
+  media_router_ui_->JoinRoute(sink_id, route_id);

[imcheng, 2015/11/19 18:55:08]

Do we need to check HasPendingRouteRequest() similar to OnCreateRoute above?

[matt.boetger, 2015/11/24 19:45:24]

Done.

+}
+
+void MediaRouterWebUIMessageHandler::OnCloseRoute(const base::ListValue* args) {
   DVLOG(1) << "OnCloseRoute";
   const base::DictionaryValue* args_dict = nullptr;
   std::string route_id;
   if (!args->GetDictionary(0, &args_dict) ||
       !args_dict->GetString("routeId", &route_id)) {
     DVLOG(1) << "Unable to extract args.";
     return;
   }
   media_router_ui_->CloseRoute(route_id);
 }
@@ skipping 30 matching lines @@
     open_args->AppendString(learn_more_url);
     web_ui()->CallJavascriptFunction(kWindowOpen, *open_args);
     return true;
   } else {
     // Do nothing; no other issue action types require any other action.
     return true;
   }
 }
 
 }  // namespace media_router