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

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

Issue 2176613003: [Media Router] Clean up issues related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 4 years 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_type_converters.cc
diff --git a/chrome/browser/media/router/mojo/media_router_type_converters.cc b/chrome/browser/media/router/mojo/media_router_type_converters.cc
index c1a7522aa98bf62b5cda11c21ae5b5b960618cf8..66a216f97cba937d5a96ffd4ba3dc02454c13d07 100644
--- a/chrome/browser/media/router/mojo/media_router_type_converters.cc
+++ b/chrome/browser/media/router/mojo/media_router_type_converters.cc
@@ -6,7 +6,6 @@
#include "chrome/browser/media/router/mojo/media_router_type_converters.h"
-using media_router::mojom::IssuePtr;
using media_router::mojom::MediaRoutePtr;
using media_router::mojom::MediaSinkPtr;
@@ -102,51 +101,6 @@ TypeConverter<std::unique_ptr<media_router::MediaRoute>,
return media_route;
}
-media_router::Issue::Severity IssueSeverityFromMojo(
- media_router::mojom::Issue::Severity severity) {
- switch (severity) {
- case media_router::mojom::Issue::Severity::FATAL:
- return media_router::Issue::FATAL;
- case media_router::mojom::Issue::Severity::WARNING:
- return media_router::Issue::WARNING;
- case media_router::mojom::Issue::Severity::NOTIFICATION:
- return media_router::Issue::NOTIFICATION;
- default:
- NOTREACHED() << "Unknown issue severity " << severity;
- return media_router::Issue::WARNING;
- }
-}
-
-media_router::IssueAction::Type IssueActionTypeFromMojo(
- media_router::mojom::Issue::ActionType action_type) {
- switch (action_type) {
- case media_router::mojom::Issue::ActionType::DISMISS:
- return media_router::IssueAction::TYPE_DISMISS;
- case media_router::mojom::Issue::ActionType::LEARN_MORE:
- return media_router::IssueAction::TYPE_LEARN_MORE;
- default:
- NOTREACHED() << "Unknown issue action type " << action_type;
- return media_router::IssueAction::TYPE_DISMISS;
- }
-}
-
-// static
-media_router::Issue TypeConverter<media_router::Issue, IssuePtr>::Convert(
- const IssuePtr& input) {
- std::vector<media_router::IssueAction> actions;
- if (input->secondary_actions) {
- actions.reserve(input->secondary_actions->size());
- for (auto a : *input->secondary_actions)
- actions.push_back(media_router::IssueAction(IssueActionTypeFromMojo(a)));
- }
- return media_router::Issue(
- input->title, input->message.value_or(std::string()),
- media_router::IssueAction(IssueActionTypeFromMojo(input->default_action)),
- actions, input->route_id.value_or(std::string()),
- IssueSeverityFromMojo(input->severity),
- input->is_blocking, input->help_page_id);
-}
-
content::PresentationConnectionState PresentationConnectionStateFromMojo(
PresentationConnectionState state) {
switch (state) {

Powered by Google App Engine
This is Rietveld 408576698