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

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

Issue 1761793005: [Media Router] Do not issue a tab mirroring sinks query if tab is not valid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 52f2ec2cdea423065ec9f01448e1e1d72d363bc5..9b7aa31f98d291bbdcad6d1a8c7d671ddfc370c4 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -264,14 +264,16 @@ void MediaRouterUI::InitCommon(content::WebContents* initiator) {
query_result_manager_.reset(new QueryResultManager(router_));
query_result_manager_->AddObserver(this);
- // These modes are always available.
+ // Desktop mirror mode is always available.
query_result_manager_->StartSinksQuery(MediaCastMode::DESKTOP_MIRROR,
MediaSourceForDesktop());
initiator_ = initiator;
- MediaSource mirroring_source(
- MediaSourceForTab(SessionTabHelper::IdForTab(initiator)));
- query_result_manager_->StartSinksQuery(MediaCastMode::TAB_MIRROR,
- mirroring_source);
+ SessionID::id_type tab_id = SessionTabHelper::IdForTab(initiator);
+ if (tab_id != -1) {
+ MediaSource mirroring_source(MediaSourceForTab(tab_id));
+ query_result_manager_->StartSinksQuery(MediaCastMode::TAB_MIRROR,
+ mirroring_source);
+ }
UpdateCastModes();
}
« no previous file with comments | « no previous file | chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698