[Media Router] Set timeout for route creation.

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/strings/stringprintf.h"
@@ skipping 12 matching lines @@
 
 // Message names.
 const char kRequestInitialData[] = "requestInitialData";
 const char kCreateRoute[] = "requestRoute";
 const char kActOnIssue[] = "actOnIssue";
 const char kCloseRoute[] = "closeRoute";
 const char kCloseDialog[] = "closeDialog";
 
 // 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";
 const char kSetSinkList[] = "media_router.ui.setSinkList";
 const char kSetRouteList[] = "media_router.ui.setRouteList";
 const char kSetCastModeList[] = "media_router.ui.setCastModeList";
 const char kWindowOpen[] = "window.open";
 
 scoped_ptr<base::ListValue> SinksToValue(
     const std::vector<MediaSinkWithCastModes>& sinks) {
   scoped_ptr<base::ListValue> value(new base::ListValue);
 
   for (const MediaSinkWithCastModes& sink_with_cast_modes : sinks) {
     scoped_ptr<base::DictionaryValue> sink_val(new base::DictionaryValue);
 
     const MediaSink& sink = sink_with_cast_modes.sink;
     sink_val->SetString("id", sink.id());
     sink_val->SetString("name", sink.name());
     sink_val->SetInteger("iconType", sink.icon_type());
-    sink_val->SetBoolean("isLaunching", sink.is_launching());
 
     scoped_ptr<base::ListValue> cast_modes_val(new base::ListValue);
     for (MediaCastMode cast_mode : sink_with_cast_modes.cast_modes)
       cast_modes_val->AppendInteger(cast_mode);
     sink_val->Set("castModes", cast_modes_val.Pass());
 
     value->Append(sink_val.release());
   }
 
   return value.Pass();
@@ skipping 149 matching lines @@
   DVLOG(2) << "UpdateIssue";
   if (issue) {
     scoped_ptr<base::DictionaryValue> issue_val(IssueToValue(*issue));
     web_ui()->CallJavascriptFunction(kSetIssue, *issue_val);
   } else {
     // Clears the issue in the WebUI.
     web_ui()->CallJavascriptFunction(kSetIssue);
   }
 }
 
+void MediaRouterWebUIMessageHandler::NotifyRouteCreationTimeout() {
+  DVLOG(2) << "NotifyRouteCreationTimeout";
+  web_ui()->CallJavascriptFunction(kNotifyRouteCreationTimeout);
+}
+
 void MediaRouterWebUIMessageHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       kRequestInitialData,
       base::Bind(&MediaRouterWebUIMessageHandler::OnRequestInitialData,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       kCreateRoute,
       base::Bind(&MediaRouterWebUIMessageHandler::OnCreateRoute,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
@@ skipping 54 matching lines @@
   }
 
   if (sink_id.empty()) {
     DVLOG(1) << "Media Route UI did not respond with a "
              << "valid sink ID. Aborting.";
     return;
   }
 
   MediaRouterUI* media_router_ui =
       static_cast<MediaRouterUI*>(web_ui()->GetController());
-  if (media_router_ui->has_pending_route_request()) {
+  if (media_router_ui->HasPendingRouteRequest()) {
     DVLOG(1) << "UI already has pending route request. Ignoring.";
     Issue issue(
         l10n_util::GetStringUTF8(IDS_MEDIA_ROUTER_ISSUE_PENDING_ROUTE),
         std::string(), IssueAction(IssueAction::TYPE_DISMISS),
         std::vector<IssueAction>(), std::string(), Issue::NOTIFICATION,
         false, std::string());
     media_router_ui_->AddIssue(issue);
     return;
   }
 
@@ skipping 74 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