| 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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 #endif | 188 #endif |
| 189 // TODO(dspringer): When NaCl is on by default, remove this flag entry. | 189 // TODO(dspringer): When NaCl is on by default, remove this flag entry. |
| 190 { | 190 { |
| 191 switches::kEnableNaCl, // FLAGS:RECORD_UMA | 191 switches::kEnableNaCl, // FLAGS:RECORD_UMA |
| 192 IDS_FLAGS_ENABLE_NACL_NAME, | 192 IDS_FLAGS_ENABLE_NACL_NAME, |
| 193 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, | 193 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, |
| 194 kOsAll, | 194 kOsAll, |
| 195 SINGLE_VALUE_TYPE(switches::kEnableNaCl) | 195 SINGLE_VALUE_TYPE(switches::kEnableNaCl) |
| 196 }, | 196 }, |
| 197 { | 197 { |
| 198 "dns-server", // FLAGS:RECORD_UMA | |
| 199 IDS_FLAGS_DNS_SERVER_NAME, | |
| 200 IDS_FLAGS_DNS_SERVER_DESCRIPTION, | |
| 201 kOsAll, | |
| 202 SINGLE_VALUE_TYPE(switches::kDnsServer) | |
| 203 }, | |
| 204 { | |
| 205 "extension-apis", // FLAGS:RECORD_UMA | 198 "extension-apis", // FLAGS:RECORD_UMA |
| 206 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, | 199 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, |
| 207 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, | 200 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, |
| 208 kOsAll, | 201 kOsAll, |
| 209 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) | 202 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) |
| 210 }, | 203 }, |
| 211 { | 204 { |
| 212 "click-to-play", // FLAGS:RECORD_UMA | 205 "click-to-play", // FLAGS:RECORD_UMA |
| 213 IDS_FLAGS_CLICK_TO_PLAY_NAME, | 206 IDS_FLAGS_CLICK_TO_PLAY_NAME, |
| 214 IDS_FLAGS_CLICK_TO_PLAY_DESCRIPTION, | 207 IDS_FLAGS_CLICK_TO_PLAY_DESCRIPTION, |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 795 } | 788 } |
| 796 | 789 |
| 797 const Experiment* GetExperiments(size_t* count) { | 790 const Experiment* GetExperiments(size_t* count) { |
| 798 *count = num_experiments; | 791 *count = num_experiments; |
| 799 return experiments; | 792 return experiments; |
| 800 } | 793 } |
| 801 | 794 |
| 802 } // namespace testing | 795 } // namespace testing |
| 803 | 796 |
| 804 } // namespace about_flags | 797 } // namespace about_flags |
| OLD | NEW |