Index: chrome/browser/media/router/media_router_type_converters.h |
diff --git a/chrome/browser/media/router/media_router_type_converters.h b/chrome/browser/media/router/media_router_type_converters.h |
index 608f380578e79cf46e66c0e4e580e397e2a4d7d4..23d8c3648efe531389f66db9125785b2354698bf 100644 |
--- a/chrome/browser/media/router/media_router_type_converters.h |
+++ b/chrome/browser/media/router/media_router_type_converters.h |
@@ -24,21 +24,14 @@ template <> |
struct TypeConverter<media_router::MediaSink, |
media_router::interfaces::MediaSinkPtr> { |
static media_router::MediaSink Convert( |
- const media_router::interfaces::MediaSinkPtr& input) { |
- return media_router::MediaSink(input->sink_id, input->name); |
- } |
+ const media_router::interfaces::MediaSinkPtr& input); |
}; |
+ |
template <> |
struct TypeConverter<media_router::interfaces::MediaSinkPtr, |
media_router::MediaSink> { |
static media_router::interfaces::MediaSinkPtr Convert( |
- const media_router::MediaSink& input) { |
- media_router::interfaces::MediaSinkPtr output( |
- media_router::interfaces::MediaSink::New()); |
- output->sink_id = input.id(); |
- output->name = input.name(); |
- return output.Pass(); |
- } |
+ const media_router::MediaSink& input); |
}; |
// MediaRoute conversion. |
@@ -46,30 +39,14 @@ template <> |
struct TypeConverter<media_router::MediaRoute, |
media_router::interfaces::MediaRoutePtr> { |
static media_router::MediaRoute Convert( |
- const media_router::interfaces::MediaRoutePtr& input) { |
- return media_router::MediaRoute( |
- input->media_route_id, media_router::MediaSource(input->media_source), |
- input->media_sink.To<media_router::MediaSink>(), input->description, |
- input->is_local); |
- } |
+ const media_router::interfaces::MediaRoutePtr& input); |
}; |
+ |
template <> |
struct TypeConverter<media_router::interfaces::MediaRoutePtr, |
media_router::MediaRoute> { |
static media_router::interfaces::MediaRoutePtr Convert( |
- const media_router::MediaRoute& input) { |
- media_router::interfaces::MediaRoutePtr output( |
- media_router::interfaces::MediaRoute::New()); |
- if (!input.media_source().Empty()) |
- output->media_source = input.media_source().id(); |
- output->media_route_id = input.media_route_id(); |
- output->media_sink = |
- media_router::interfaces::MediaSink::From<media_router::MediaSink>( |
- input.media_sink()); |
- output->description = input.description(); |
- output->is_local = input.is_local(); |
- return output.Pass(); |
- } |
+ const media_router::MediaRoute& input); |
}; |
// Issue conversion. |
@@ -82,22 +59,7 @@ media_router::IssueAction::Type IssueActionTypeFromMojo( |
template <> |
struct TypeConverter<media_router::Issue, media_router::interfaces::IssuePtr> { |
static media_router::Issue Convert( |
- const media_router::interfaces::IssuePtr& input) { |
- std::vector<media_router::IssueAction> actions; |
- if (input->secondary_actions) { |
- actions.reserve(input->secondary_actions.size()); |
- for (size_t i = 0; i < input->secondary_actions.size(); ++i) { |
- actions.push_back(media_router::IssueAction( |
- IssueActionTypeFromMojo(input->secondary_actions[i]))); |
- } |
- } |
- return media_router::Issue( |
- input->title, input->message, |
- media_router::IssueAction( |
- IssueActionTypeFromMojo(input->default_action)), |
- actions, input->route_id, IssueSeverityFromMojo(input->severity), |
- input->is_blocking, input->help_url); |
- } |
+ const media_router::interfaces::IssuePtr& input); |
}; |
} // namespace mojo |