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 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 369 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
370 autofill::switches::kDisableFillOnAccountSelect, "" }, | 370 autofill::switches::kDisableFillOnAccountSelect, "" }, |
371 { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_HIGHLIGHTING, | 371 { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_HIGHLIGHTING, |
372 autofill::switches::kEnableFillOnAccountSelect, "" }, | 372 autofill::switches::kEnableFillOnAccountSelect, "" }, |
373 { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_NO_HIGHLIGHTING, | 373 { IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_ENABLE_NO_HIGHLIGHTING, |
374 autofill::switches::kEnableFillOnAccountSelectNoHighlighting, "" }, | 374 autofill::switches::kEnableFillOnAccountSelectNoHighlighting, "" }, |
375 }; | 375 }; |
376 | 376 |
377 #if defined(ENABLE_TOPCHROME_MD) | 377 #if defined(ENABLE_TOPCHROME_MD) |
378 const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = { | 378 const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = { |
379 {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, | 379 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
380 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, | 380 { IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, |
381 switches::kTopChromeMD, | 381 switches::kTopChromeMD, |
382 switches::kTopChromeMDMaterial}, | 382 switches::kTopChromeMDNonMaterial }, |
383 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, | 383 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL, |
384 switches::kTopChromeMD, | 384 switches::kTopChromeMD, |
385 switches::kTopChromeMDMaterialHybrid}}; | 385 switches::kTopChromeMDMaterial }, |
| 386 { IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, |
| 387 switches::kTopChromeMD, |
| 388 switches::kTopChromeMDMaterialHybrid }, |
| 389 }; |
386 #endif | 390 #endif |
387 | 391 |
388 #if defined(OS_CHROMEOS) | 392 #if defined(OS_CHROMEOS) |
389 const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { | 393 const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { |
390 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 394 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
391 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, | 395 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, |
392 switches::kMaterialDesignInkDropAnimationSpeed, | 396 switches::kMaterialDesignInkDropAnimationSpeed, |
393 switches::kMaterialDesignInkDropAnimationSpeedFast}, | 397 switches::kMaterialDesignInkDropAnimationSpeedFast}, |
394 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, | 398 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, |
395 switches::kMaterialDesignInkDropAnimationSpeed, | 399 switches::kMaterialDesignInkDropAnimationSpeed, |
(...skipping 1954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2350 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2354 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2351 | 2355 |
2352 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2356 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2353 *count = arraysize(kFeatureEntries); | 2357 *count = arraysize(kFeatureEntries); |
2354 return kFeatureEntries; | 2358 return kFeatureEntries; |
2355 } | 2359 } |
2356 | 2360 |
2357 } // namespace testing | 2361 } // namespace testing |
2358 | 2362 |
2359 } // namespace about_flags | 2363 } // namespace about_flags |
OLD | NEW |