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 2583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2594 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, | 2594 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, |
2595 #endif // OS_ANDROID | 2595 #endif // OS_ANDROID |
2596 | 2596 |
2597 #if defined(USE_ASH) | 2597 #if defined(USE_ASH) |
2598 {"ash-enable-smooth-screen-rotation", | 2598 {"ash-enable-smooth-screen-rotation", |
2599 flag_descriptions::kAshEnableSmoothScreenRotationName, | 2599 flag_descriptions::kAshEnableSmoothScreenRotationName, |
2600 flag_descriptions::kAshEnableSmoothScreenRotationDescription, kOsCrOS, | 2600 flag_descriptions::kAshEnableSmoothScreenRotationDescription, kOsCrOS, |
2601 SINGLE_VALUE_TYPE(ash::switches::kAshEnableSmoothScreenRotation)}, | 2601 SINGLE_VALUE_TYPE(ash::switches::kAshEnableSmoothScreenRotation)}, |
2602 #endif // defined(USE_ASH) | 2602 #endif // defined(USE_ASH) |
2603 | 2603 |
| 2604 #if defined(OS_CHROMEOS) |
| 2605 {"enable-zip-archiver-on-file-manager", |
| 2606 flag_descriptions::kEnableZipArchiverOnFileManagerName, |
| 2607 flag_descriptions::kEnableZipArchiverOnFileManagerDescription, |
| 2608 kOsCrOS, |
| 2609 SINGLE_VALUE_TYPE( |
| 2610 chromeos::switches::kEnableZipArchiverOnFileManager)}, |
| 2611 #endif // OS_CHROMEOS |
| 2612 |
2604 // NOTE: Adding new command-line switches requires adding corresponding | 2613 // NOTE: Adding new command-line switches requires adding corresponding |
2605 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2614 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2606 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2615 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2607 }; | 2616 }; |
2608 | 2617 |
2609 class FlagsStateSingleton { | 2618 class FlagsStateSingleton { |
2610 public: | 2619 public: |
2611 FlagsStateSingleton() | 2620 FlagsStateSingleton() |
2612 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2621 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2613 ~FlagsStateSingleton() {} | 2622 ~FlagsStateSingleton() {} |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2810 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2819 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2811 | 2820 |
2812 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2821 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2813 *count = arraysize(kFeatureEntries); | 2822 *count = arraysize(kFeatureEntries); |
2814 return kFeatureEntries; | 2823 return kFeatureEntries; |
2815 } | 2824 } |
2816 | 2825 |
2817 } // namespace testing | 2826 } // namespace testing |
2818 | 2827 |
2819 } // namespace about_flags | 2828 } // namespace about_flags |
OLD | NEW |