Commit c9390761 authored by Derek Cheng's avatar Derek Cheng Committed by Commit Bot

[MediaRouter] Add ROUTE_ALREADY_EXISTS result code.

This will be used for in-browser DIAL MRP
(https://chromium-review.googlesource.com/c/chromium/src/+/1036611) and
other future MRP implementations to indicate a MediaRoute already
exists when trying to CreateRoute.

Bug: 816628
Change-Id: Id43d91be7318362043cc33a3c0500cc9463f5a5d
Reviewed-on: https://chromium-review.googlesource.com/1062145Reviewed-by: default avatarAdam Parker <amp@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Derek Cheng <imcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559249}
parent 772cce9a
...@@ -199,7 +199,7 @@ struct SinkSearchCriteria { ...@@ -199,7 +199,7 @@ struct SinkSearchCriteria {
// - RouteRequestResult::ResultCode in route_request_result.h // - RouteRequestResult::ResultCode in route_request_result.h
// - MediaRouteProviderResult enum in tools/metrics/histograms.xml. // - MediaRouteProviderResult enum in tools/metrics/histograms.xml.
// - mr.RouteRequestResultCode in route_request_error.js // - mr.RouteRequestResultCode in route_request_error.js
// - RouteRequestResultCodeFromMojo in media_router_type_converters.cc // - media_router_struct_traits.h
enum RouteRequestResultCode { enum RouteRequestResultCode {
UNKNOWN_ERROR, UNKNOWN_ERROR,
OK, OK,
...@@ -209,7 +209,8 @@ enum RouteRequestResultCode { ...@@ -209,7 +209,8 @@ enum RouteRequestResultCode {
INVALID_ORIGIN, INVALID_ORIGIN,
INCOGNITO_MISMATCH, INCOGNITO_MISMATCH,
NO_SUPPORTED_PROVIDER, NO_SUPPORTED_PROVIDER,
CANCELLED CANCELLED,
ROUTE_ALREADY_EXISTS
// New values must be added here. // New values must be added here.
}; };
......
...@@ -473,6 +473,9 @@ struct EnumTraits<media_router::mojom::RouteRequestResultCode, ...@@ -473,6 +473,9 @@ struct EnumTraits<media_router::mojom::RouteRequestResultCode,
NO_SUPPORTED_PROVIDER; NO_SUPPORTED_PROVIDER;
case media_router::RouteRequestResult::CANCELLED: case media_router::RouteRequestResult::CANCELLED:
return media_router::mojom::RouteRequestResultCode::CANCELLED; return media_router::mojom::RouteRequestResultCode::CANCELLED;
case media_router::RouteRequestResult::ROUTE_ALREADY_EXISTS:
return media_router::mojom::RouteRequestResultCode::
ROUTE_ALREADY_EXISTS;
default: default:
NOTREACHED() << "Unknown RouteRequestResultCode " NOTREACHED() << "Unknown RouteRequestResultCode "
<< static_cast<int>(code); << static_cast<int>(code);
...@@ -510,6 +513,9 @@ struct EnumTraits<media_router::mojom::RouteRequestResultCode, ...@@ -510,6 +513,9 @@ struct EnumTraits<media_router::mojom::RouteRequestResultCode,
case media_router::mojom::RouteRequestResultCode::CANCELLED: case media_router::mojom::RouteRequestResultCode::CANCELLED:
*output = media_router::RouteRequestResult::CANCELLED; *output = media_router::RouteRequestResult::CANCELLED;
return true; return true;
case media_router::mojom::RouteRequestResultCode::ROUTE_ALREADY_EXISTS:
*output = media_router::RouteRequestResult::ROUTE_ALREADY_EXISTS;
return true;
} }
return false; return false;
} }
......
...@@ -35,7 +35,7 @@ class RouteRequestResult { ...@@ -35,7 +35,7 @@ class RouteRequestResult {
// - RouteRequestResultCode in media_router.mojom // - RouteRequestResultCode in media_router.mojom
// - MediaRouteProviderResult enum in tools/metrics/histograms.xml // - MediaRouteProviderResult enum in tools/metrics/histograms.xml
// - mr.RouteRequestResultCode in route_request_error.js // - mr.RouteRequestResultCode in route_request_error.js
// - RouteRequestResultCodeFromMojo in media_router_type_converters.cc // - media_router_struct_traits.h
enum ResultCode { enum ResultCode {
UNKNOWN_ERROR = 0, UNKNOWN_ERROR = 0,
OK = 1, OK = 1,
...@@ -46,9 +46,10 @@ class RouteRequestResult { ...@@ -46,9 +46,10 @@ class RouteRequestResult {
INCOGNITO_MISMATCH = 6, INCOGNITO_MISMATCH = 6,
NO_SUPPORTED_PROVIDER = 7, NO_SUPPORTED_PROVIDER = 7,
CANCELLED = 8, CANCELLED = 8,
ROUTE_ALREADY_EXISTS = 9,
// New values must be added here. // New values must be added here.
TOTAL_COUNT = 9 // The total number of values. TOTAL_COUNT = 10 // The total number of values.
}; };
static std::unique_ptr<RouteRequestResult> FromSuccess( static std::unique_ptr<RouteRequestResult> FromSuccess(
......
...@@ -29656,6 +29656,7 @@ Called by update_use_counter_css.py.--> ...@@ -29656,6 +29656,7 @@ Called by update_use_counter_css.py.-->
<int value="6" label="OffTheRecordMismatch"/> <int value="6" label="OffTheRecordMismatch"/>
<int value="7" label="NoSupportedProvider"/> <int value="7" label="NoSupportedProvider"/>
<int value="8" label="Cancelled"/> <int value="8" label="Cancelled"/>
<int value="9" label="RouteAlreadyExists"/>
</enum> </enum>
<enum name="MediaRouteProviderVersion"> <enum name="MediaRouteProviderVersion">
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment