| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 kOsAll, | 168 kOsAll, |
| 169 SINGLE_VALUE_TYPE(switches::kDisableGpuVsync) | 169 SINGLE_VALUE_TYPE(switches::kDisableGpuVsync) |
| 170 }, | 170 }, |
| 171 { | 171 { |
| 172 "gpu-canvas-2d", // FLAGS:RECORD_UMA | 172 "gpu-canvas-2d", // FLAGS:RECORD_UMA |
| 173 IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME, | 173 IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME, |
| 174 IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION, | 174 IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION, |
| 175 kOsWin | kOsLinux | kOsCrOS, | 175 kOsWin | kOsLinux | kOsCrOS, |
| 176 SINGLE_VALUE_TYPE(switches::kEnableAccelerated2dCanvas) | 176 SINGLE_VALUE_TYPE(switches::kEnableAccelerated2dCanvas) |
| 177 }, | 177 }, |
| 178 #if !defined(GOOGLE_CHROME_BUILD) || defined(OS_MACOSX) | |
| 179 // Only expose this for Chromium builds where users may not have the PDF | 178 // Only expose this for Chromium builds where users may not have the PDF |
| 180 // plugin. Do not give Google Chrome users the option to disable it here, | 179 // plugin. Do not give Google Chrome users the option to disable it here, |
| 181 // except on Mac, where it is disabled. | 180 // except on Mac, where it is disabled. |
| 182 { | 181 { |
| 183 "print-preview", // FLAGS:RECORD_UMA | 182 "print-preview", // FLAGS:RECORD_UMA |
| 184 IDS_FLAGS_PRINT_PREVIEW_NAME, | 183 IDS_FLAGS_PRINT_PREVIEW_NAME, |
| 185 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION, | 184 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION, |
| 186 kOsMac | kOsWin | kOsLinux, // This switch is not available in CrOS. | 185 kOsMac | kOsWin | kOsLinux, // This switch is not available in CrOS. |
| 187 SINGLE_VALUE_TYPE(switches::kEnablePrintPreview) | 186 SINGLE_VALUE_TYPE(switches::kEnablePrintPreview) |
| 188 }, | 187 }, |
| 189 #endif | |
| 190 // TODO(dspringer): When NaCl is on by default, remove this flag entry. | 188 // TODO(dspringer): When NaCl is on by default, remove this flag entry. |
| 191 { | 189 { |
| 192 switches::kEnableNaCl, // FLAGS:RECORD_UMA | 190 switches::kEnableNaCl, // FLAGS:RECORD_UMA |
| 193 IDS_FLAGS_ENABLE_NACL_NAME, | 191 IDS_FLAGS_ENABLE_NACL_NAME, |
| 194 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, | 192 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, |
| 195 kOsAll, | 193 kOsAll, |
| 196 SINGLE_VALUE_TYPE(switches::kEnableNaCl) | 194 SINGLE_VALUE_TYPE(switches::kEnableNaCl) |
| 197 }, | 195 }, |
| 198 { | 196 { |
| 199 "dns-server", // FLAGS:RECORD_UMA | 197 "dns-server", // FLAGS:RECORD_UMA |
| (...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 776 } | 774 } |
| 777 | 775 |
| 778 const Experiment* GetExperiments(size_t* count) { | 776 const Experiment* GetExperiments(size_t* count) { |
| 779 *count = num_experiments; | 777 *count = num_experiments; |
| 780 return experiments; | 778 return experiments; |
| 781 } | 779 } |
| 782 | 780 |
| 783 } // namespace testing | 781 } // namespace testing |
| 784 | 782 |
| 785 } // namespace about_flags | 783 } // namespace about_flags |
| OLD | NEW |