| Index: chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
|
| diff --git a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
|
| index 835c72691759333ae6d9f820d7cd78920cdcc321..94a0f124715c4152de4b464c60f62428931f9a55 100644
|
| --- a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
|
| +++ b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
|
| @@ -22,38 +22,38 @@ namespace chrome {
|
| namespace {
|
|
|
| static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE) ==
|
| - static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_NONE),
|
| + static_cast<int>(display::DISPLAY_CONNECTION_TYPE_NONE),
|
| "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE value mismatch");
|
| static_assert(
|
| static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_UNKNOWN) ==
|
| - static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_UNKNOWN),
|
| + static_cast<int>(display::DISPLAY_CONNECTION_TYPE_UNKNOWN),
|
| "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_UNKNOWN value mismatch");
|
| static_assert(
|
| static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_INTERNAL) ==
|
| - static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_INTERNAL),
|
| + static_cast<int>(display::DISPLAY_CONNECTION_TYPE_INTERNAL),
|
| "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_INTERNAL value mismatch");
|
| static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA) ==
|
| - static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_VGA),
|
| + static_cast<int>(display::DISPLAY_CONNECTION_TYPE_VGA),
|
| "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA value mismatch");
|
| static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI) ==
|
| - static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_HDMI),
|
| + static_cast<int>(display::DISPLAY_CONNECTION_TYPE_HDMI),
|
| "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI value mismatch");
|
| static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI) ==
|
| - static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_DVI),
|
| + static_cast<int>(display::DISPLAY_CONNECTION_TYPE_DVI),
|
| "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI value mismatch");
|
| static_assert(
|
| static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DISPLAYPORT) ==
|
| - static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_DISPLAYPORT),
|
| + static_cast<int>(display::DISPLAY_CONNECTION_TYPE_DISPLAYPORT),
|
| "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DISPLAYPORT value mismatch");
|
| static_assert(
|
| static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NETWORK) ==
|
| - static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_NETWORK),
|
| + static_cast<int>(display::DISPLAY_CONNECTION_TYPE_NETWORK),
|
| "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NETWORK value mismatch");
|
| static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_NONE) ==
|
| - static_cast<int>(ui::CONTENT_PROTECTION_METHOD_NONE),
|
| + static_cast<int>(display::CONTENT_PROTECTION_METHOD_NONE),
|
| "PP_OUTPUT_PROTECTION_METHOD_PRIVATE_NONE value mismatch");
|
| static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP) ==
|
| - static_cast<int>(ui::CONTENT_PROTECTION_METHOD_HDCP),
|
| + static_cast<int>(display::CONTENT_PROTECTION_METHOD_HDCP),
|
| "PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP value mismatch");
|
|
|
| } // namespace
|
|
|