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

Unified Diff: chrome/browser/media/router/mojo/media_router_mojo_impl.cc

Issue 2324133003: [Media Router] Use TimeDelta in mojo interfaces (Closed)
Patch Set: Fix timeout rename for joinRoute Created 4 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/media/router/mojo/media_router_mojo_impl.cc
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
index 18f8c1d7a7ecf78c0cd6028f2d6658a13d2d7b1e..0155befb565755e77520c24b47b319a01e1e4747 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
@@ -598,8 +598,7 @@ void MediaRouterMojoImpl::DoCreateRoute(
<< ", presentation ID: " << presentation_id;
media_route_provider_->CreateRoute(
- source_id, sink_id, presentation_id, origin, tab_id,
- timeout > base::TimeDelta() ? timeout.InMilliseconds() : 0, incognito,
+ source_id, sink_id, presentation_id, origin, tab_id, timeout, incognito,
base::Bind(&MediaRouterMojoImpl::RouteResponseReceived,
base::Unretained(this), presentation_id, incognito,
callbacks));
@@ -617,8 +616,7 @@ void MediaRouterMojoImpl::DoJoinRoute(
<< ", presentation ID: " << presentation_id;
media_route_provider_->JoinRoute(
- source_id, presentation_id, origin, tab_id,
- timeout > base::TimeDelta() ? timeout.InMilliseconds() : 0, incognito,
+ source_id, presentation_id, origin, tab_id, timeout, incognito,
base::Bind(&MediaRouterMojoImpl::RouteResponseReceived,
base::Unretained(this), presentation_id, incognito,
callbacks));
@@ -638,8 +636,7 @@ void MediaRouterMojoImpl::DoConnectRouteByRouteId(
<< ", presentation ID: " << presentation_id;
media_route_provider_->ConnectRouteByRouteId(
- source_id, route_id, presentation_id, origin, tab_id,
- timeout > base::TimeDelta() ? timeout.InMilliseconds() : 0, incognito,
+ source_id, route_id, presentation_id, origin, tab_id, timeout, incognito,
base::Bind(&MediaRouterMojoImpl::RouteResponseReceived,
base::Unretained(this), presentation_id, incognito,
callbacks));

Powered by Google App Engine
This is Rietveld 408576698