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 2467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2478 flag_descriptions::kUseNewDoodleApiDescription, kOsAndroid, | 2478 flag_descriptions::kUseNewDoodleApiDescription, kOsAndroid, |
2479 FEATURE_VALUE_TYPE(chrome::android::kUseNewDoodleApi)}, | 2479 FEATURE_VALUE_TYPE(chrome::android::kUseNewDoodleApi)}, |
2480 #endif // OS_ANDROID | 2480 #endif // OS_ANDROID |
2481 | 2481 |
2482 {"delay-navigation", flag_descriptions::kDelayNavigationName, | 2482 {"delay-navigation", flag_descriptions::kDelayNavigationName, |
2483 flag_descriptions::kDelayNavigationDescription, kOsAll, | 2483 flag_descriptions::kDelayNavigationDescription, kOsAll, |
2484 FEATURE_WITH_PARAMS_VALUE_TYPE(kDelayNavigationFeature, | 2484 FEATURE_WITH_PARAMS_VALUE_TYPE(kDelayNavigationFeature, |
2485 kDelayNavigationFeatureVariations, | 2485 kDelayNavigationFeatureVariations, |
2486 "DelayNavigation")}, | 2486 "DelayNavigation")}, |
2487 | 2487 |
| 2488 #if defined(OS_ANDROID) |
| 2489 {"enable-custom-context-menu", |
| 2490 flag_descriptions::kEnableCustomContextMenuName, |
| 2491 flag_descriptions::kEnableCustomContextMenuDescription, kOsAndroid, |
| 2492 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, |
| 2493 #endif // OS_ANDROID |
| 2494 |
2488 // NOTE: Adding new command-line switches requires adding corresponding | 2495 // NOTE: Adding new command-line switches requires adding corresponding |
2489 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2496 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2490 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2497 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2491 }; | 2498 }; |
2492 | 2499 |
2493 class FlagsStateSingleton { | 2500 class FlagsStateSingleton { |
2494 public: | 2501 public: |
2495 FlagsStateSingleton() | 2502 FlagsStateSingleton() |
2496 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2503 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2497 ~FlagsStateSingleton() {} | 2504 ~FlagsStateSingleton() {} |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2686 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2693 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2687 | 2694 |
2688 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2695 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2689 *count = arraysize(kFeatureEntries); | 2696 *count = arraysize(kFeatureEntries); |
2690 return kFeatureEntries; | 2697 return kFeatureEntries; |
2691 } | 2698 } |
2692 | 2699 |
2693 } // namespace testing | 2700 } // namespace testing |
2694 | 2701 |
2695 } // namespace about_flags | 2702 } // namespace about_flags |
OLD | NEW |