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 2570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2581 kDelayNavigationFeatureVariations, | 2581 kDelayNavigationFeatureVariations, |
2582 "DelayNavigation")}, | 2582 "DelayNavigation")}, |
2583 | 2583 |
2584 #if defined(OS_ANDROID) | 2584 #if defined(OS_ANDROID) |
2585 {"enable-custom-context-menu", | 2585 {"enable-custom-context-menu", |
2586 flag_descriptions::kEnableCustomContextMenuName, | 2586 flag_descriptions::kEnableCustomContextMenuName, |
2587 flag_descriptions::kEnableCustomContextMenuDescription, kOsAndroid, | 2587 flag_descriptions::kEnableCustomContextMenuDescription, kOsAndroid, |
2588 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, | 2588 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, |
2589 #endif // OS_ANDROID | 2589 #endif // OS_ANDROID |
2590 | 2590 |
| 2591 #if defined(USE_ASH) |
| 2592 {"ash-enable-smooth-screen-rotation", |
| 2593 flag_descriptions::kAshEnableSmoothScreenRotationName, |
| 2594 flag_descriptions::kAshEnableSmoothScreenRotationDescription, kOsCrOS, |
| 2595 SINGLE_VALUE_TYPE(ash::switches::kAshEnableSmoothScreenRotation)}, |
| 2596 #endif // defined(USE_ASH) |
| 2597 |
2591 // NOTE: Adding new command-line switches requires adding corresponding | 2598 // NOTE: Adding new command-line switches requires adding corresponding |
2592 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2599 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2593 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2600 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2594 }; | 2601 }; |
2595 | 2602 |
2596 class FlagsStateSingleton { | 2603 class FlagsStateSingleton { |
2597 public: | 2604 public: |
2598 FlagsStateSingleton() | 2605 FlagsStateSingleton() |
2599 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2606 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2600 ~FlagsStateSingleton() {} | 2607 ~FlagsStateSingleton() {} |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2797 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2804 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2798 | 2805 |
2799 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2806 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2800 *count = arraysize(kFeatureEntries); | 2807 *count = arraysize(kFeatureEntries); |
2801 return kFeatureEntries; | 2808 return kFeatureEntries; |
2802 } | 2809 } |
2803 | 2810 |
2804 } // namespace testing | 2811 } // namespace testing |
2805 | 2812 |
2806 } // namespace about_flags | 2813 } // namespace about_flags |
OLD | NEW |