Attachment #577140 for bug #684272




        "disable-accelerated-video-decode",
        flag_descriptions::kAcceleratedVideoDecodeName,
        flag_descriptions::kAcceleratedVideoDecodeDescription,
        kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
        SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
    },
#if defined(OS_WIN)

     FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
#endif  // ENABLE_ISOLATED_XR_SERVICE
#endif  // ENABLE_VR
#if defined(OS_CHROMEOS) || defined(OS_LINUX)
    {"disable-accelerated-mjpeg-decode",
     flag_descriptions::kAcceleratedMjpegDecodeName,
     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
#endif  // OS_CHROMEOS // OS_LINUX
    {"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
     flag_descriptions::kV8CacheOptionsDescription, kOsAll,
     MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},





#endif

// Chrome OS Linux-------------------------------------------------------------------

#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))

const char kAcceleratedMjpegDecodeName[] =
    "Hardware-accelerated mjpeg decode for captured frame";
const char kAcceleratedMjpegDecodeDescription[] =
    "Enable hardware-accelerated mjpeg decode for captured frame where "
    "available.";
#endif

// Chrome OS --------------------------------------------------

#if defined(OS_CHROMEOS)

const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
const char kAllowTouchpadThreeFingerClickDescription[] =





#endif  // defined(OS_MACOSX)

// Chrome OS and Linux ------------------------------------------------------------------

#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))

extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];

#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))

// Chrome OS ------------------------------------------------------------------------

#if defined(OS_CHROMEOS)

extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];


Return to bug 684272

Lines 3096-3110 const char kTextSuggestionsTouchBarDescription[] = Link Here

(-)a/chrome/browser/flag_descriptions.cc (-2 / +7 lines)
3096		3096
3097	#endif	3097	#endif
3098		3098
3099	// Chrome OS -------------------------------------------------------------------	3099	// Chrome OS Linux-------------------------------------------------------------------
3100		3100
3101	#if defined(OS_CHROMEOS)	3101	#if defined(OS_CHROMEOS) \|\| (defined(OS_LINUX) && !defined(OS_ANDROID))
3102		3102
3103	const char kAcceleratedMjpegDecodeName[] =	3103	const char kAcceleratedMjpegDecodeName[] =
3104	"Hardware-accelerated mjpeg decode for captured frame";	3104	"Hardware-accelerated mjpeg decode for captured frame";
3105	const char kAcceleratedMjpegDecodeDescription[] =	3105	const char kAcceleratedMjpegDecodeDescription[] =
3106	"Enable hardware-accelerated mjpeg decode for captured frame where "	3106	"Enable hardware-accelerated mjpeg decode for captured frame where "
3107	"available.";	3107	"available.";
		3108	#endif
		3109
		3110	// Chrome OS --------------------------------------------------
		3111
		3112	#if defined(OS_CHROMEOS)
3108		3113
3109	const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";	3114	const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
3110	const char kAllowTouchpadThreeFingerClickDescription[] =	3115	const char kAllowTouchpadThreeFingerClickDescription[] =

Lines 1842-1854 extern const char kPermissionPromptPersistenceToggleDescription[]; Link Here

(-)a/chrome/browser/flag_descriptions.h (-2 / +8 lines)
1842		1842
1843	#endif // defined(OS_MACOSX)	1843	#endif // defined(OS_MACOSX)
1844		1844
1845	// Chrome OS ------------------------------------------------------------------	1845	// Chrome OS and Linux ------------------------------------------------------------------
1846		1846
1847	#if defined(OS_CHROMEOS)	1847	#if defined(OS_CHROMEOS) \|\| (defined(OS_LINUX) && !defined(OS_ANDROID))
1848		1848
1849	extern const char kAcceleratedMjpegDecodeName[];	1849	extern const char kAcceleratedMjpegDecodeName[];
1850	extern const char kAcceleratedMjpegDecodeDescription[];	1850	extern const char kAcceleratedMjpegDecodeDescription[];
1851		1851
		1852	#endif // defined(OS_CHROMEOS) \|\| (defined(OS_LINUX) && !defined(OS_ANDROID))
		1853
		1854	// Chrome OS ------------------------------------------------------------------------
		1855
		1856	#if defined(OS_CHROMEOS)
		1857
1852	extern const char kAllowTouchpadThreeFingerClickName[];	1858	extern const char kAllowTouchpadThreeFingerClickName[];
1853	extern const char kAllowTouchpadThreeFingerClickDescription[];	1859	extern const char kAllowTouchpadThreeFingerClickDescription[];
1854		1860

Lines 1606-1612 const FeatureEntry kFeatureEntries[] = { Link Here

(-)a/chrome/browser/about_flags.cc (-4 / +4 lines)
1606	"disable-accelerated-video-decode",	1606	"disable-accelerated-video-decode",
1607	flag_descriptions::kAcceleratedVideoDecodeName,	1607	flag_descriptions::kAcceleratedVideoDecodeName,
1608	flag_descriptions::kAcceleratedVideoDecodeDescription,	1608	flag_descriptions::kAcceleratedVideoDecodeDescription,
1609	kOsMac \| kOsWin \| kOsCrOS \| kOsAndroid,	1609	kOsMac \| kOsWin \| kOsCrOS \| kOsAndroid \| kOsLinux,
1610	SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),	1610	SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
1611	},	1611	},
1612	#if defined(OS_WIN)	1612	#if defined(OS_WIN)
Lines 2216-2227 const FeatureEntry kFeatureEntries[] = { Link Here
2216	FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},	2216	FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
2217	#endif // ENABLE_ISOLATED_XR_SERVICE	2217	#endif // ENABLE_ISOLATED_XR_SERVICE
2218	#endif // ENABLE_VR	2218	#endif // ENABLE_VR
2219	#if defined(OS_CHROMEOS)	2219	#if defined(OS_CHROMEOS) \|\| defined(OS_LINUX)
2220	{"disable-accelerated-mjpeg-decode",	2220	{"disable-accelerated-mjpeg-decode",
2221	flag_descriptions::kAcceleratedMjpegDecodeName,	2221	flag_descriptions::kAcceleratedMjpegDecodeName,
2222	flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,	2222	flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS \| kOsLinux,
2223	SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},	2223	SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
2224	#endif // OS_CHROMEOS	2224	#endif // OS_CHROMEOS // OS_LINUX
2225	{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,	2225	{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
2226	flag_descriptions::kV8CacheOptionsDescription, kOsAll,	2226	flag_descriptions::kV8CacheOptionsDescription, kOsAll,
2227	MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},	2227	MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},