diff options
| author | nduca@google.com <nduca@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:55:43 +0000 |
|---|---|---|
| committer | nduca@google.com <nduca@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:55:43 +0000 |
| commit | 72787e39b9326a740d74226eb6dea26d20691c14 (patch) | |
| tree | 35fc551a9d849f78162604629350adabb3e31125 /chrome/browser/about_flags.cc | |
| parent | 97e1cf634c5f89d37c9685b9c8178e280788e368 (diff) | |
| download | chromium_src-72787e39b9326a740d74226eb6dea26d20691c14.zip chromium_src-72787e39b9326a740d74226eb6dea26d20691c14.tar.gz chromium_src-72787e39b9326a740d74226eb6dea26d20691c14.tar.bz2 | |
Add disable for threaded compositing to about:flags in preparation for turning it on on CrOS
TBR=jamesr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9839038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags.cc')
| -rw-r--r-- | chrome/browser/about_flags.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index ad8adfd..d82ddd8 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -91,6 +91,14 @@ const Experiment::Choice kOmniboxInlineHistoryQuickProviderChoices[] = { switches::kOmniboxInlineHistoryQuickProviderProhibited } }; +const Experiment::Choice kThreadedCompositingModeChoices[] = { + { IDS_FLAGS_THREADED_COMPOSITING_MODE_DEFAULT, "", "" }, + { IDS_FLAGS_THREADED_COMPOSITING_MODE_DISABLED, + switches::kDisableThreadedCompositing, ""}, + { IDS_FLAGS_THREADED_COMPOSITING_MODE_ENABLED, + switches::kEnableThreadedCompositing, ""} +}; + // RECORDING USER METRICS FOR FLAGS: // ----------------------------------------------------------------------------- // The first line of the experiment is the internal name. If you'd like to @@ -180,11 +188,11 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kForceCompositingMode) }, { - "enable-threaded-compositing", - IDS_FLAGS_ENABLE_THREADED_COMPOSITING_NAME, - IDS_FLAGS_ENABLE_THREADED_COMPOSITING_DESCRIPTION, + "threaded-compositing-mode", + IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME, + IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION, kOsAll, - SINGLE_VALUE_TYPE(switches::kEnableThreadedCompositing) + MULTI_VALUE_TYPE(kThreadedCompositingModeChoices) }, { "enable-threaded-animation", |