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

Side by Side Diff: chrome/browser/ui/webui/media_router/media_router_ui.cc

Issue 1693963003: Pass origin to StartObservingMediaSinks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Marks Review Fixes with URL changes Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/media_router/media_router_ui.h" 5 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 263
264 query_result_manager_.reset(new QueryResultManager(router_)); 264 query_result_manager_.reset(new QueryResultManager(router_));
265 query_result_manager_->AddObserver(this); 265 query_result_manager_->AddObserver(this);
266 266
267 // These modes are always available. 267 // These modes are always available.
268 query_result_manager_->StartSinksQuery(MediaCastMode::DESKTOP_MIRROR, 268 query_result_manager_->StartSinksQuery(MediaCastMode::DESKTOP_MIRROR,
269 MediaSourceForDesktop()); 269 MediaSourceForDesktop());
270 initiator_ = initiator; 270 initiator_ = initiator;
271 MediaSource mirroring_source( 271 MediaSource mirroring_source(
272 MediaSourceForTab(SessionTabHelper::IdForTab(initiator))); 272 MediaSourceForTab(SessionTabHelper::IdForTab(initiator)));
273 mirroring_source.set_origin(chrome::kChromeUIMediaRouterURL);
273 query_result_manager_->StartSinksQuery(MediaCastMode::TAB_MIRROR, 274 query_result_manager_->StartSinksQuery(MediaCastMode::TAB_MIRROR,
274 mirroring_source); 275 mirroring_source);
275 UpdateCastModes(); 276 UpdateCastModes();
276 } 277 }
277 278
278 void MediaRouterUI::InitForTest(MediaRouter* router, 279 void MediaRouterUI::InitForTest(MediaRouter* router,
279 content::WebContents* initiator, 280 content::WebContents* initiator,
280 MediaRouterWebUIMessageHandler* handler) { 281 MediaRouterWebUIMessageHandler* handler) {
281 router_ = router; 282 router_ = router;
282 handler_ = handler; 283 handler_ = handler;
283 InitCommon(initiator); 284 InitCommon(initiator);
284 } 285 }
285 286
286 void MediaRouterUI::OnDefaultPresentationChanged( 287 void MediaRouterUI::OnDefaultPresentationChanged(
287 const PresentationRequest& presentation_request) { 288 const PresentationRequest& presentation_request) {
288 MediaSource source = presentation_request.GetMediaSource(); 289 MediaSource source = presentation_request.GetMediaSource();
290 source.set_origin(GetFrameURL().spec());
289 presentation_request_.reset(new PresentationRequest(presentation_request)); 291 presentation_request_.reset(new PresentationRequest(presentation_request));
290 query_result_manager_->StartSinksQuery(MediaCastMode::DEFAULT, source); 292 query_result_manager_->StartSinksQuery(MediaCastMode::DEFAULT, source);
291 // Register for MediaRoute updates. 293 // Register for MediaRoute updates.
292 routes_observer_.reset(new UIMediaRoutesObserver( 294 routes_observer_.reset(new UIMediaRoutesObserver(
293 router_, source.id(), 295 router_, source.id(),
294 base::Bind(&MediaRouterUI::OnRoutesUpdated, base::Unretained(this)))); 296 base::Bind(&MediaRouterUI::OnRoutesUpdated, base::Unretained(this))));
295 297
296 UpdateCastModes(); 298 UpdateCastModes();
297 } 299 }
298 300
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 base::Time::Now() - start_time_); 558 base::Time::Now() - start_time_);
557 start_time_ = base::Time(); 559 start_time_ = base::Time();
558 } 560 }
559 } 561 }
560 562
561 void MediaRouterUI::UpdateMaxDialogHeight(int height) { 563 void MediaRouterUI::UpdateMaxDialogHeight(int height) {
562 handler_->UpdateMaxDialogHeight(height); 564 handler_->UpdateMaxDialogHeight(height);
563 } 565 }
564 566
565 } // namespace media_router 567 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698