| OLD | NEW |
| 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE, | 355 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE, |
| 356 switches::kExtensionContentVerification, | 356 switches::kExtensionContentVerification, |
| 357 switches::kExtensionContentVerificationEnforce }, | 357 switches::kExtensionContentVerificationEnforce }, |
| 358 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT, | 358 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT, |
| 359 switches::kExtensionContentVerification, | 359 switches::kExtensionContentVerification, |
| 360 switches::kExtensionContentVerificationEnforceStrict }, | 360 switches::kExtensionContentVerificationEnforceStrict }, |
| 361 }; | 361 }; |
| 362 | 362 |
| 363 const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = { | 363 const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = { |
| 364 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 364 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 365 { IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, | |
| 366 switches::kTopChromeMD, | |
| 367 switches::kTopChromeMDNonMaterial }, | |
| 368 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL, | 365 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL, |
| 369 switches::kTopChromeMD, | 366 switches::kTopChromeMD, |
| 370 switches::kTopChromeMDMaterial }, | 367 switches::kTopChromeMDMaterial }, |
| 371 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, | 368 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, |
| 372 switches::kTopChromeMD, | 369 switches::kTopChromeMD, |
| 373 switches::kTopChromeMDMaterialHybrid }, | 370 switches::kTopChromeMDMaterialHybrid }, |
| 374 }; | 371 }; |
| 375 | 372 |
| 376 #if defined(OS_CHROMEOS) | 373 #if defined(OS_CHROMEOS) |
| 377 | 374 |
| (...skipping 1890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2268 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2265 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2269 | 2266 |
| 2270 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2267 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2271 *count = arraysize(kFeatureEntries); | 2268 *count = arraysize(kFeatureEntries); |
| 2272 return kFeatureEntries; | 2269 return kFeatureEntries; |
| 2273 } | 2270 } |
| 2274 | 2271 |
| 2275 } // namespace testing | 2272 } // namespace testing |
| 2276 | 2273 |
| 2277 } // namespace about_flags | 2274 } // namespace about_flags |
| OLD | NEW |