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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 484473002: Revert of Replace enable-compositing-for-fixed-position with prefer-compositing-to-lcd-text. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 first = std::find(cmdline.argv().begin(), cmdline.argv().end(), 134 first = std::find(cmdline.argv().begin(), cmdline.argv().end(),
135 GetSwitchString(chromeos::switches::kPolicySwitchesBegin)); 135 GetSwitchString(chromeos::switches::kPolicySwitchesBegin));
136 last = std::find(cmdline.argv().begin(), cmdline.argv().end(), 136 last = std::find(cmdline.argv().begin(), cmdline.argv().end(),
137 GetSwitchString(chromeos::switches::kPolicySwitchesEnd)); 137 GetSwitchString(chromeos::switches::kPolicySwitchesEnd));
138 if (first != cmdline.argv().end() && last != cmdline.argv().end()) 138 if (first != cmdline.argv().end() && last != cmdline.argv().end())
139 flags.insert(first + 1, last); 139 flags.insert(first + 1, last);
140 #endif 140 #endif
141 return flags; 141 return flags;
142 } 142 }
143 143
144 const Experiment::Choice kEnableCompositingForFixedPositionChoices[] = {
145 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
146 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
147 switches::kEnableCompositingForFixedPosition, ""},
148 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
149 switches::kDisableCompositingForFixedPosition, ""},
150 { IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_HIGH_DPI,
151 switches::kEnableHighDpiCompositingForFixedPosition, ""}
152 };
153
144 const Experiment::Choice kEnableCompositingForTransitionChoices[] = { 154 const Experiment::Choice kEnableCompositingForTransitionChoices[] = {
145 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 155 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
146 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 156 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
147 switches::kEnableCompositingForTransition, ""}, 157 switches::kEnableCompositingForTransition, ""},
148 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 158 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
149 switches::kDisableCompositingForTransition, ""}, 159 switches::kDisableCompositingForTransition, ""},
150 }; 160 };
151 161
152 const Experiment::Choice kEnableAcceleratedFixedRootBackgroundChoices[] = { 162 const Experiment::Choice kEnableAcceleratedFixedRootBackgroundChoices[] = {
153 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 163 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 #if defined(OS_ANDROID) 647 #if defined(OS_ANDROID)
638 { 648 {
639 "disable-webaudio", 649 "disable-webaudio",
640 IDS_FLAGS_DISABLE_WEBAUDIO_NAME, 650 IDS_FLAGS_DISABLE_WEBAUDIO_NAME,
641 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, 651 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION,
642 kOsAndroid, 652 kOsAndroid,
643 SINGLE_VALUE_TYPE(switches::kDisableWebAudio) 653 SINGLE_VALUE_TYPE(switches::kDisableWebAudio)
644 }, 654 },
645 #endif 655 #endif
646 { 656 {
657 "enable-compositing-for-fixed-position",
658 IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_NAME,
659 IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_DESCRIPTION,
660 kOsAll,
661 MULTI_VALUE_TYPE(kEnableCompositingForFixedPositionChoices)
662 },
663 {
647 "enable-compositing-for-transition", 664 "enable-compositing-for-transition",
648 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_NAME, 665 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_NAME,
649 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_DESCRIPTION, 666 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_DESCRIPTION,
650 kOsAll, 667 kOsAll,
651 MULTI_VALUE_TYPE(kEnableCompositingForTransitionChoices) 668 MULTI_VALUE_TYPE(kEnableCompositingForTransitionChoices)
652 }, 669 },
653 { 670 {
654 "enable-accelerated-fixed-root-background", 671 "enable-accelerated-fixed-root-background",
655 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_NAME, 672 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_NAME,
656 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_DESCRIPTION, 673 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_DESCRIPTION,
(...skipping 1837 matching lines...) Expand 10 before | Expand all | Expand 10 after
2494 } 2511 }
2495 2512
2496 const Experiment* GetExperiments(size_t* count) { 2513 const Experiment* GetExperiments(size_t* count) {
2497 *count = num_experiments; 2514 *count = num_experiments;
2498 return experiments; 2515 return experiments;
2499 } 2516 }
2500 2517
2501 } // namespace testing 2518 } // namespace testing
2502 2519
2503 } // namespace about_flags 2520 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698