| 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,
|
|
|