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

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

Issue 3974004: Revert 63535 - Disable GPU features AcceleratingCompositing and WebGL by defa... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 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/renderer_host/browser_render_process_host.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 kOsWin, 121 kOsWin,
122 switches::kEnableCloudPrintProxy 122 switches::kEnableCloudPrintProxy
123 }, 123 },
124 { 124 {
125 "match-preview", // Do not change; see above. 125 "match-preview", // Do not change; see above.
126 IDS_FLAGS_INSTANT_NAME, 126 IDS_FLAGS_INSTANT_NAME,
127 IDS_FLAGS_INSTANT_DESCRIPTION, 127 IDS_FLAGS_INSTANT_DESCRIPTION,
128 kOsMac, 128 kOsMac,
129 switches::kEnableMatchPreview 129 switches::kEnableMatchPreview
130 }, 130 },
131 { 131 // FIXME(scheib): Add Flags entry for accelerated Compositing,
132 "gpu-compositing", // Do not change; see above 132 // or pull it and the strings in generated_resources.grd by Dec 2010
133 IDS_FLAGS_ACCELERATED_COMPOSITING_NAME, 133 // {
134 IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION, 134 // "gpu-compositing", // Do not change; see above
135 kOsAll, 135 // IDS_FLAGS_ACCELERATED_COMPOSITING_NAME,
136 switches::kEnableAcceleratedCompositing 136 // IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION,
137 }, 137 // kOsAll,
138 // switches::kDisableAcceleratedCompositing
139 // },
138 { 140 {
139 "gpu-canvas-2d", // Do not change; see above 141 "gpu-canvas-2d", // Do not change; see above
140 IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME, 142 IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME,
141 IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION, 143 IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION,
142 kOsWin | kOsLinux | kOsCrOS, 144 kOsWin | kOsLinux | kOsCrOS,
143 switches::kEnableAccelerated2dCanvas 145 switches::kEnableAccelerated2dCanvas
144 }, 146 },
145 { 147 // FIXME(scheib): Add Flags entry for WebGL,
146 "webgl", // Do not change; see above 148 // or pull it and the strings in generated_resources.grd by Dec 2010
147 IDS_FLAGS_WEBGL_NAME, 149 // {
148 IDS_FLAGS_WEBGL_DESCRIPTION, 150 // "webgl", // Do not change; see above
149 kOsAll, 151 // IDS_FLAGS_WEBGL_NAME,
150 switches::kEnableExperimentalWebGL 152 // IDS_FLAGS_WEBGL_DESCRIPTION,
151 }, 153 // kOsAll,
154 // switches::kDisableExperimentalWebGL
155 // }
152 { 156 {
153 "print-preview", // Do not change; see above 157 "print-preview", // Do not change; see above
154 IDS_FLAGS_PRINT_PREVIEW_NAME, 158 IDS_FLAGS_PRINT_PREVIEW_NAME,
155 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION, 159 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION,
156 kOsAll, 160 kOsAll,
157 switches::kEnablePrintPreview 161 switches::kEnablePrintPreview
158 }, 162 },
159 { 163 {
160 "dns-server", 164 "dns-server",
161 IDS_FLAGS_DNS_SERVER_NAME, 165 IDS_FLAGS_DNS_SERVER_NAME,
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 394
391 } // namespace 395 } // namespace
392 396
393 namespace testing { 397 namespace testing {
394 void ClearState() { 398 void ClearState() {
395 FlagsState::instance()->reset(); 399 FlagsState::instance()->reset();
396 } 400 }
397 } // namespace testing 401 } // namespace testing
398 402
399 } // namespace about_flags 403 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698