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 2471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2482 kDelayNavigationFeatureVariations, | 2482 kDelayNavigationFeatureVariations, |
2483 "DelayNavigation")}, | 2483 "DelayNavigation")}, |
2484 | 2484 |
2485 #if defined(OS_ANDROID) | 2485 #if defined(OS_ANDROID) |
2486 {"enable-custom-context-menu", | 2486 {"enable-custom-context-menu", |
2487 flag_descriptions::kEnableCustomContextMenuName, | 2487 flag_descriptions::kEnableCustomContextMenuName, |
2488 flag_descriptions::kEnableCustomContextMenuDescription, kOsAndroid, | 2488 flag_descriptions::kEnableCustomContextMenuDescription, kOsAndroid, |
2489 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, | 2489 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, |
2490 #endif // OS_ANDROID | 2490 #endif // OS_ANDROID |
2491 | 2491 |
| 2492 #if defined(USE_ASH) |
| 2493 {"ash-enable-smooth-screen-rotation", |
| 2494 flag_descriptions::kAshEnableSmoothScreenRotationName, |
| 2495 flag_descriptions::kAshEnableSmoothScreenRotationDescription, kOsCrOS, |
| 2496 SINGLE_VALUE_TYPE(ash::switches::kAshEnableSmoothScreenRotation)}, |
| 2497 #endif // defined(USE_ASH) |
| 2498 |
2492 // NOTE: Adding new command-line switches requires adding corresponding | 2499 // NOTE: Adding new command-line switches requires adding corresponding |
2493 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2500 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2494 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2501 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2495 }; | 2502 }; |
2496 | 2503 |
2497 class FlagsStateSingleton { | 2504 class FlagsStateSingleton { |
2498 public: | 2505 public: |
2499 FlagsStateSingleton() | 2506 FlagsStateSingleton() |
2500 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2507 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2501 ~FlagsStateSingleton() {} | 2508 ~FlagsStateSingleton() {} |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2690 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2697 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2691 | 2698 |
2692 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2699 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2693 *count = arraysize(kFeatureEntries); | 2700 *count = arraysize(kFeatureEntries); |
2694 return kFeatureEntries; | 2701 return kFeatureEntries; |
2695 } | 2702 } |
2696 | 2703 |
2697 } // namespace testing | 2704 } // namespace testing |
2698 | 2705 |
2699 } // namespace about_flags | 2706 } // namespace about_flags |
OLD | NEW |