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

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

Issue 1363593003: [Media Router] Set timeout for route creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes per imcheng@'s comments and offline conversation. Rebase (forgot to upload separately, sorry!). Created 5 years, 3 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 5a0b66c2f992021e26a5356da2d34a4e9850d8dc..2738921b2c1885faa1e3e7f2c2d883f6deff0c34 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
@@ -30,6 +30,8 @@ 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";
@@ -219,6 +221,11 @@ void MediaRouterWebUIMessageHandler::UpdateIssue(const Issue* issue) {
}
}
+void MediaRouterWebUIMessageHandler::NotifyRouteCreationTimeout() {
+ DVLOG(2) << "NotifyRouteCreationTimeout";
+ web_ui()->CallJavascriptFunction(kNotifyRouteCreationTimeout);
+}
+
void MediaRouterWebUIMessageHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback(
kRequestInitialData,
@@ -293,7 +300,7 @@ void MediaRouterWebUIMessageHandler::OnCreateRoute(
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),

Powered by Google App Engine
This is Rietveld 408576698