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 2398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2409 IDS_FLAGS_USE_NEW_DOODLE_API_DESCRIPTION, kOsAndroid, | 2409 IDS_FLAGS_USE_NEW_DOODLE_API_DESCRIPTION, kOsAndroid, |
2410 FEATURE_VALUE_TYPE(chrome::android::kUseNewDoodleApi)}, | 2410 FEATURE_VALUE_TYPE(chrome::android::kUseNewDoodleApi)}, |
2411 #endif // OS_ANDROID | 2411 #endif // OS_ANDROID |
2412 | 2412 |
2413 {"delay-navigation", IDS_FLAGS_DELAY_NAVIGATION_NAME, | 2413 {"delay-navigation", IDS_FLAGS_DELAY_NAVIGATION_NAME, |
2414 IDS_FLAGS_DELAY_NAVIGATION_DESCRIPTION, kOsAll, | 2414 IDS_FLAGS_DELAY_NAVIGATION_DESCRIPTION, kOsAll, |
2415 FEATURE_WITH_PARAMS_VALUE_TYPE(kDelayNavigationFeature, | 2415 FEATURE_WITH_PARAMS_VALUE_TYPE(kDelayNavigationFeature, |
2416 kDelayNavigationFeatureVariations, | 2416 kDelayNavigationFeatureVariations, |
2417 "DelayNavigation")}, | 2417 "DelayNavigation")}, |
2418 | 2418 |
| 2419 #if defined(USE_ASH) |
| 2420 {"ash-enable-smooth-screen-rotation-animation", |
| 2421 IDS_FLAGS_ASH_ENABLE_SMOOTH_SCREEN_ROTATION_ANIMATION_NAME, |
| 2422 IDS_FLAGS_ASH_ENABLE_SMOOTH_SCREEN_ROTATION_ANIMATION_DESCRIPTION, kOsCrOS, |
| 2423 SINGLE_VALUE_TYPE(ash::switches::kAshEnableSmoothScreenRotationAnimation)}, |
| 2424 #endif // defined(USE_ASH) |
| 2425 |
2419 // NOTE: Adding new command-line switches requires adding corresponding | 2426 // NOTE: Adding new command-line switches requires adding corresponding |
2420 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2427 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2421 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2428 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2422 }; | 2429 }; |
2423 | 2430 |
2424 class FlagsStateSingleton { | 2431 class FlagsStateSingleton { |
2425 public: | 2432 public: |
2426 FlagsStateSingleton() | 2433 FlagsStateSingleton() |
2427 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2434 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2428 ~FlagsStateSingleton() {} | 2435 ~FlagsStateSingleton() {} |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2617 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2624 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2618 | 2625 |
2619 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2626 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2620 *count = arraysize(kFeatureEntries); | 2627 *count = arraysize(kFeatureEntries); |
2621 return kFeatureEntries; | 2628 return kFeatureEntries; |
2622 } | 2629 } |
2623 | 2630 |
2624 } // namespace testing | 2631 } // namespace testing |
2625 | 2632 |
2626 } // namespace about_flags | 2633 } // namespace about_flags |
OLD | NEW |