Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: chrome/browser/about_flags.cc

Issue 11633020: Re-enable about:flags on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing nilesh's comments Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/about_flags_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index fd2db82bcd86297aeb9c392a3d0045d42bc736d6..78813c8e565640d940ea0068cf7603bcf496bda9 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -70,6 +70,7 @@ void AddOsStrings(unsigned bitmask, ListValue* list) {
{kOsWin, "Windows"},
{kOsLinux, "Linux"},
{kOsCrOS, "Chrome OS"},
+ {kOsAndroid, "Android"},
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kBitsToOs); ++i)
if (bitmask & kBitsToOs[i].bit)
@@ -379,11 +380,26 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(switches::kDisableGpuVsync)
},
{
+ "enable-webgl",
+ IDS_FLAGS_ENABLE_WEBGL_NAME,
+ IDS_FLAGS_ENABLE_WEBGL_DESCRIPTION,
+ kOsAndroid,
+#if defined(OS_ANDROID)
+ SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebGL)
+#else
+ SINGLE_VALUE_TYPE("")
+#endif
+ },
+ {
"disable-webgl",
IDS_FLAGS_DISABLE_WEBGL_NAME,
IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
- kOsAll,
+ kOsAll ^ kOsAndroid,
+#if defined(OS_ANDROID)
+ SINGLE_VALUE_TYPE("")
+#else
SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
+#endif
},
{
"fixed-position-creates-stacking-context",
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/about_flags_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698