Commit 39f8cc4a authored by Trent Begin's avatar Trent Begin Committed by Commit Bot

Remvoe redundent ifdef for ChromeOSDirectVideo flag

This block already is inside of the OS_CHROMEOS block so there is no
need for another check. This makes the block easier to reason about.

Bug: none
Change-Id: I23f5bd494e45e7699eefc7b6e9c102680ddf928e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490988Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Trent Begin <tbegin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819937}
parent 865984a0
...@@ -3668,7 +3668,7 @@ const char kCameraSystemWebAppName[] = "Camera System Web App"; ...@@ -3668,7 +3668,7 @@ const char kCameraSystemWebAppName[] = "Camera System Web App";
const char kCameraSystemWebAppDescription[] = const char kCameraSystemWebAppDescription[] =
"Run the Chrome Camera App as a System Web App."; "Run the Chrome Camera App as a System Web App.";
#if defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) #if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
const char kChromeOSDirectVideoDecoderName[] = "ChromeOS Direct Video Decoder"; const char kChromeOSDirectVideoDecoderName[] = "ChromeOS Direct Video Decoder";
const char kChromeOSDirectVideoDecoderDescription[] = const char kChromeOSDirectVideoDecoderDescription[] =
"Enables the hardware-accelerated ChromeOS direct media::VideoDecoder " "Enables the hardware-accelerated ChromeOS direct media::VideoDecoder "
...@@ -3677,7 +3677,7 @@ const char kChromeOSDirectVideoDecoderDescription[] = ...@@ -3677,7 +3677,7 @@ const char kChromeOSDirectVideoDecoderDescription[] =
"which is added for platforms where said direct VideoDecoder does not work " "which is added for platforms where said direct VideoDecoder does not work "
"or is not well tested (see the disable_cros_video_decoder USE flag in " "or is not well tested (see the disable_cros_video_decoder USE flag in "
"Chrome OS)"; "Chrome OS)";
#endif // defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) #endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
const char kCdmFactoryDaemonName[] = "CDM Factory Daemon"; const char kCdmFactoryDaemonName[] = "CDM Factory Daemon";
const char kCdmFactoryDaemonDescription[] = const char kCdmFactoryDaemonDescription[] =
......
...@@ -2119,10 +2119,10 @@ extern const char kBluetoothFixA2dpPacketSizeDescription[]; ...@@ -2119,10 +2119,10 @@ extern const char kBluetoothFixA2dpPacketSizeDescription[];
extern const char kCameraSystemWebAppName[]; extern const char kCameraSystemWebAppName[];
extern const char kCameraSystemWebAppDescription[]; extern const char kCameraSystemWebAppDescription[];
#if defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) #if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
extern const char kChromeOSDirectVideoDecoderName[]; extern const char kChromeOSDirectVideoDecoderName[];
extern const char kChromeOSDirectVideoDecoderDescription[]; extern const char kChromeOSDirectVideoDecoderDescription[];
#endif // defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) #endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
extern const char kCdmFactoryDaemonName[]; extern const char kCdmFactoryDaemonName[];
extern const char kCdmFactoryDaemonDescription[]; extern const char kCdmFactoryDaemonDescription[];
......
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