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

Unified Diff: chrome/browser/about_flags.cc

Issue 131443007: aura: Remove old GL paths from RenderWidgetHostViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: aboutflags Created 6 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
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 62b4a73e1937bf8c2b44ee41e684126684e6dd5c..456bd86616a516db92a37a26aef98757d684d8f3 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -216,6 +216,7 @@ const Experiment::Choice kLCDTextChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, cc::switches::kDisableLCDText, ""}
};
+#ifndef USE_AURA
const Experiment::Choice kDelegatedRendererChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
{ IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
@@ -223,6 +224,7 @@ const Experiment::Choice kDelegatedRendererChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
switches::kDisableDelegatedRenderer, ""}
};
+#endif
const Experiment::Choice kMaxTilesForInterestAreaChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
@@ -1446,16 +1448,15 @@ const Experiment kExperiments[] = {
kOsDesktop,
MULTI_VALUE_TYPE(kLCDTextChoices)
},
+#ifndef USE_AURA
{
"delegated-renderer",
IDS_FLAGS_DELEGATED_RENDERER_NAME,
IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION,
-#ifdef USE_AURA
- kOsWin | kOsLinux |
-#endif
- kOsAndroid | kOsCrOS,
+ kOsAndroid,
MULTI_VALUE_TYPE(kDelegatedRendererChoices)
},
+#endif
{
"enable-websocket-experimental-implementation",
IDS_FLAGS_ENABLE_EXPERIMENTAL_WEBSOCKET_NAME,

Powered by Google App Engine
This is Rietveld 408576698