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

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

Issue 2518083002: Deprecated: [Media Router] Ensure dialog shows route details view if there is one local route (Closed)
Patch Set: Created 4 years, 1 month 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_ui.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
index 3374fc27a4c5285c2972b246aa0fd5e50e5f571d..4c219108c950b0ae2edf0f4e748841a551a7d8e8 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -164,6 +164,7 @@ MediaRouterUI::MediaRouterUI(content::WebUI* web_ui)
: ConstrainedWebDialogUI(web_ui),
handler_(new MediaRouterWebUIMessageHandler(this)),
ui_initialized_(false),
+ initial_routes_received_(false),
current_route_request_id_(-1),
route_request_counter_(0),
initiator_(nullptr),
@@ -366,6 +367,9 @@ void MediaRouterUI::UIInitialized() {
if (!issues_observer_)
issues_observer_.reset(new UIIssuesObserver(router_, this));
issues_observer_->RegisterObserver();
+
+ if (initial_routes_received_)
+ handler_->UpdateRoutes(routes_, joinable_route_ids_, current_cast_modes_);
}
bool MediaRouterUI::CreateRoute(const MediaSink::Id& sink_id,
@@ -522,7 +526,8 @@ void MediaRouterUI::OnResultsUpdated(
}
void MediaRouterUI::SetIssue(const Issue* issue) {
- if (ui_initialized_) handler_->UpdateIssue(issue);
+ if (ui_initialized_)
+ handler_->UpdateIssue(issue);
}
void MediaRouterUI::OnRoutesUpdated(
@@ -550,6 +555,8 @@ void MediaRouterUI::OnRoutesUpdated(
if (ui_initialized_)
handler_->UpdateRoutes(routes_, joinable_route_ids_, current_cast_modes_);
+ if (!initial_routes_received_)
+ initial_routes_received_ = true;
}
void MediaRouterUI::OnRouteResponseReceived(

Powered by Google App Engine
This is Rietveld 408576698