[about:flags] Disable flags on Android
Disable some flags that don't make sense for Android (e.g. NaCl).
BUG=170406
Review URL: https://chromiumcodereview.appspot.com/11968055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178366 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 23a5e3e5..9fa8daa 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -58,6 +58,7 @@
namespace {
const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid;
+const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS;
// Adds a |StringValue| to |list| for each platform where |bitmask| indicates
// whether the experiment is available on that platform.
@@ -306,7 +307,7 @@
"crxless-web-apps",
IDS_FLAGS_CRXLESS_WEB_APPS_NAME,
IDS_FLAGS_CRXLESS_WEB_APPS_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableCrxlessWebApps)
},
{
@@ -327,7 +328,7 @@
"threaded-compositing-mode",
IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME,
IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION,
- kOsAll & ~kOsCrOS,
+ kOsDesktop & ~kOsCrOS,
MULTI_VALUE_TYPE(kThreadedCompositingModeChoices)
},
{
@@ -376,7 +377,7 @@
"disable-gpu-vsync",
IDS_FLAGS_DISABLE_GPU_VSYNC_NAME,
IDS_FLAGS_DISABLE_GPU_VSYNC_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kDisableGpuVsync)
},
{
@@ -394,7 +395,7 @@
"disable-webgl",
IDS_FLAGS_DISABLE_WEBGL_NAME,
IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
- kOsAll ^ kOsAndroid,
+ kOsDesktop,
#if defined(OS_ANDROID)
SINGLE_VALUE_TYPE("")
#else
@@ -413,7 +414,7 @@
"enable-nacl", // FLAGS:RECORD_UMA
IDS_FLAGS_ENABLE_NACL_NAME,
IDS_FLAGS_ENABLE_NACL_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableNaCl)
},
// TODO(halyavin): When exception handling is on by default, replace this
@@ -422,63 +423,63 @@
"enable-nacl-exception-handling", // FLAGS:RECORD_UMA
IDS_FLAGS_ENABLE_NACL_EXCEPTION_HANDLING_NAME,
IDS_FLAGS_ENABLE_NACL_EXCEPTION_HANDLING_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableNaClExceptionHandling)
},
{
"enable-nacl-debug", // FLAGS:RECORD_UMA
IDS_FLAGS_ENABLE_NACL_DEBUG_NAME,
IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)
},
{
"nacl-debug-mask", // FLAGS:RECORD_UMA
IDS_FLAGS_NACL_DEBUG_MASK_NAME,
IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
MULTI_VALUE_TYPE(kNaClDebugMaskChoices)
},
{
"enable-pnacl", // FLAGS:RECORD_UMA
IDS_FLAGS_ENABLE_PNACL_NAME,
IDS_FLAGS_ENABLE_PNACL_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnablePnacl)
},
{
"extension-apis", // FLAGS:RECORD_UMA
IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis)
},
{
"action-box",
IDS_FLAGS_ACTION_BOX_NAME,
IDS_FLAGS_ACTION_BOX_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
MULTI_VALUE_TYPE(kActionBoxChoices),
},
{
"script-badges",
IDS_FLAGS_SCRIPT_BADGES_NAME,
IDS_FLAGS_SCRIPT_BADGES_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kScriptBadges)
},
{
"script-bubble",
IDS_FLAGS_SCRIPT_BUBBLE_NAME,
IDS_FLAGS_SCRIPT_BUBBLE_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
MULTI_VALUE_TYPE(kScriptBubbleChoices),
},
{
"apps-new-install-bubble",
IDS_FLAGS_APPS_NEW_INSTALL_BUBBLE_NAME,
IDS_FLAGS_APPS_NEW_INSTALL_BUBBLE_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kAppsNewInstallBubble)
},
{
@@ -506,7 +507,7 @@
"enable-instant-extended-api",
IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API,
IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableInstantExtendedAPI)
},
{
@@ -539,7 +540,7 @@
"sync-app-notifications",
IDS_FLAGS_SYNC_APP_NOTIFICATIONS_NAME,
IDS_FLAGS_SYNC_APP_NOTIFICATIONS_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kDisableSyncAppNotifications)
},
{
@@ -590,14 +591,14 @@
"enable-panels",
IDS_FLAGS_ENABLE_PANELS_NAME,
IDS_FLAGS_ENABLE_PANELS_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnablePanels)
},
{
"enable-panel-stacking",
IDS_FLAGS_ENABLE_PANEL_STACKING_NAME,
IDS_FLAGS_ENABLE_PANEL_STACKING_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnablePanelStacking)
},
{
@@ -647,14 +648,14 @@
"enable-encrypted-media",
IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME,
IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia)
},
{
"enable-opus-playback",
IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME,
IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback)
},
#if defined(USE_ASH)
@@ -734,14 +735,14 @@
"enable-extension-activity-ui",
IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_NAME,
IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableExtensionActivityUI)
},
{
"disable-ntp-other-sessions-menu",
IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME,
IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu)
},
#if defined(USE_ASH)
@@ -757,14 +758,14 @@
"enable-devtools-experiments",
IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME,
IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments)
},
{
"enable-suggestions-ntp",
IDS_FLAGS_NTP_SUGGESTIONS_PAGE_NAME,
IDS_FLAGS_NTP_SUGGESTIONS_PAGE_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableSuggestionsTabPage)
},
{
@@ -778,7 +779,7 @@
"touch-events",
IDS_TOUCH_EVENTS_NAME,
IDS_TOUCH_EVENTS_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
MULTI_VALUE_TYPE(kTouchEventsChoices)
},
{
@@ -836,14 +837,14 @@
"enable-download-resumption",
IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME,
IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)
},
{
"allow-nacl-socket-api",
IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME,
IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")
},
{
@@ -1016,7 +1017,7 @@
{ "disable-accelerated-video-decode",
IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
#if defined(USE_ASH)
@@ -1032,7 +1033,7 @@
"enable-webaudio-input",
IDS_FLAGS_ENABLE_WEBAUDIO_INPUT_NAME,
IDS_FLAGS_ENABLE_WEBAUDIO_INPUT_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableWebAudioInput),
},
{
@@ -1102,14 +1103,14 @@
"debug-packed-apps",
IDS_FLAGS_DEBUG_PACKED_APP_NAME,
IDS_FLAGS_DEBUG_PACKED_APP_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kDebugPackedApps)
},
{
"enable-password-generation",
IDS_FLAGS_ENABLE_PASSWORD_GENERATION_NAME,
IDS_FLAGS_ENABLE_PASSWORD_GENERATION_DESCRIPTION,
- kOsAll,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnablePasswordGeneration)
},
{
@@ -1141,7 +1142,7 @@
"enable-new-autofill-ui",
IDS_FLAGS_ENABLE_NEW_AUTOFILL_UI_NAME,
IDS_FLAGS_ENABLE_NEW_AUTOFILL_UI_DESCRIPTION,
- kOsMac | kOsWin | kOsLinux | kOsCrOS,
+ kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableNewAutofillUi)
},
{
