| Index: ui/display/mojo/display_constants_struct_traits.cc
|
| diff --git a/ui/display/mojo/display_constants_struct_traits.cc b/ui/display/mojo/display_constants_struct_traits.cc
|
| index fd710869c244dcafc36936dc2809db25cc1f469e..80eaeddb2ac65973a9dc87abd1c6345fbaabd61b 100644
|
| --- a/ui/display/mojo/display_constants_struct_traits.cc
|
| +++ b/ui/display/mojo/display_constants_struct_traits.cc
|
| @@ -14,33 +14,25 @@ display::mojom::DisplayConnectionType EnumTraits<
|
| case display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_NONE:
|
| return display::mojom::DisplayConnectionType::
|
| DISPLAY_CONNECTION_TYPE_NONE;
|
| -
|
| case display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_UNKNOWN:
|
| return display::mojom::DisplayConnectionType::
|
| DISPLAY_CONNECTION_TYPE_UNKNOWN;
|
| -
|
| case display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_INTERNAL:
|
| return display::mojom::DisplayConnectionType::
|
| DISPLAY_CONNECTION_TYPE_INTERNAL;
|
| -
|
| case display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_VGA:
|
| return display::mojom::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_VGA;
|
| -
|
| case display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_HDMI:
|
| return display::mojom::DisplayConnectionType::
|
| DISPLAY_CONNECTION_TYPE_HDMI;
|
| -
|
| case display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_DVI:
|
| return display::mojom::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_DVI;
|
| -
|
| case display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_DISPLAYPORT:
|
| return display::mojom::DisplayConnectionType::
|
| DISPLAY_CONNECTION_TYPE_DISPLAYPORT;
|
| -
|
| case display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_NETWORK:
|
| return display::mojom::DisplayConnectionType::
|
| DISPLAY_CONNECTION_TYPE_NETWORK;
|
| -
|
| case display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_VIRTUAL:
|
| return display::mojom::DisplayConnectionType::
|
| DISPLAY_CONNECTION_TYPE_VIRTUAL;
|
| @@ -57,38 +49,30 @@ bool EnumTraits<display::mojom::DisplayConnectionType,
|
| case display::mojom::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_NONE:
|
| *out = display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_NONE;
|
| return true;
|
| -
|
| case display::mojom::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_UNKNOWN:
|
| *out = display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_UNKNOWN;
|
| return true;
|
| -
|
| case display::mojom::DisplayConnectionType::
|
| DISPLAY_CONNECTION_TYPE_INTERNAL:
|
| *out = display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_INTERNAL;
|
| return true;
|
| -
|
| case display::mojom::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_VGA:
|
| *out = display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_VGA;
|
| return true;
|
| -
|
| case display::mojom::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_HDMI:
|
| *out = display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_HDMI;
|
| return true;
|
| -
|
| case display::mojom::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_DVI:
|
| *out = display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_DVI;
|
| return true;
|
| -
|
| case display::mojom::DisplayConnectionType::
|
| DISPLAY_CONNECTION_TYPE_DISPLAYPORT:
|
| *out =
|
| display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_DISPLAYPORT;
|
| return true;
|
| -
|
| case display::mojom::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_NETWORK:
|
| *out = display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_NETWORK;
|
| return true;
|
| -
|
| case display::mojom::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_VIRTUAL:
|
| *out = display::DisplayConnectionType::DISPLAY_CONNECTION_TYPE_VIRTUAL;
|
| return true;
|
| @@ -96,4 +80,38 @@ bool EnumTraits<display::mojom::DisplayConnectionType,
|
| return false;
|
| }
|
|
|
| +// static
|
| +display::mojom::HDCPState
|
| +EnumTraits<display::mojom::HDCPState, display::HDCPState>::ToMojom(
|
| + display::HDCPState type) {
|
| + switch (type) {
|
| + case display::HDCPState::HDCP_STATE_UNDESIRED:
|
| + return display::mojom::HDCPState::HDCP_STATE_UNDESIRED;
|
| + case display::HDCPState::HDCP_STATE_DESIRED:
|
| + return display::mojom::HDCPState::HDCP_STATE_DESIRED;
|
| + case display::HDCPState::HDCP_STATE_ENABLED:
|
| + return display::mojom::HDCPState::HDCP_STATE_ENABLED;
|
| + }
|
| + NOTREACHED();
|
| + return display::mojom::HDCPState::HDCP_STATE_UNDESIRED;
|
| +}
|
| +
|
| +// static
|
| +bool EnumTraits<display::mojom::HDCPState, display::HDCPState>::FromMojom(
|
| + display::mojom::HDCPState type,
|
| + display::HDCPState* out) {
|
| + switch (type) {
|
| + case display::mojom::HDCPState::HDCP_STATE_UNDESIRED:
|
| + *out = display::HDCPState::HDCP_STATE_UNDESIRED;
|
| + return true;
|
| + case display::mojom::HDCPState::HDCP_STATE_DESIRED:
|
| + *out = display::HDCPState::HDCP_STATE_DESIRED;
|
| + return true;
|
| + case display::mojom::HDCPState::HDCP_STATE_ENABLED:
|
| + *out = display::HDCPState::HDCP_STATE_ENABLED;
|
| + return true;
|
| + }
|
| + return false;
|
| +}
|
| +
|
| } // namespace mojo
|
|
|