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 2565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2576 kDelayNavigationFeatureVariations, | 2576 kDelayNavigationFeatureVariations, |
2577 "DelayNavigation")}, | 2577 "DelayNavigation")}, |
2578 | 2578 |
2579 #if defined(OS_ANDROID) | 2579 #if defined(OS_ANDROID) |
2580 {"enable-custom-context-menu", | 2580 {"enable-custom-context-menu", |
2581 flag_descriptions::kEnableCustomContextMenuName, | 2581 flag_descriptions::kEnableCustomContextMenuName, |
2582 flag_descriptions::kEnableCustomContextMenuDescription, kOsAndroid, | 2582 flag_descriptions::kEnableCustomContextMenuDescription, kOsAndroid, |
2583 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, | 2583 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, |
2584 #endif // OS_ANDROID | 2584 #endif // OS_ANDROID |
2585 | 2585 |
| 2586 #if defined(OS_CHROMEOS) |
| 2587 {"enable-zip-archiver-on-file-manager", |
| 2588 flag_descriptions::kEnableZipArchiverOnFileManagerName, |
| 2589 flag_descriptions::kEnableZipArchiverOnFileManagerDescription, |
| 2590 kOsCrOS, |
| 2591 SINGLE_VALUE_TYPE( |
| 2592 chromeos::switches::kEnableZipArchiverOnFileManager)}, |
| 2593 #endif // OS_CHROMEOS |
| 2594 |
2586 // NOTE: Adding new command-line switches requires adding corresponding | 2595 // NOTE: Adding new command-line switches requires adding corresponding |
2587 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2596 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2588 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2597 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2589 }; | 2598 }; |
2590 | 2599 |
2591 class FlagsStateSingleton { | 2600 class FlagsStateSingleton { |
2592 public: | 2601 public: |
2593 FlagsStateSingleton() | 2602 FlagsStateSingleton() |
2594 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2603 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2595 ~FlagsStateSingleton() {} | 2604 ~FlagsStateSingleton() {} |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2792 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2801 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2793 | 2802 |
2794 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2803 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2795 *count = arraysize(kFeatureEntries); | 2804 *count = arraysize(kFeatureEntries); |
2796 return kFeatureEntries; | 2805 return kFeatureEntries; |
2797 } | 2806 } |
2798 | 2807 |
2799 } // namespace testing | 2808 } // namespace testing |
2800 | 2809 |
2801 } // namespace about_flags | 2810 } // namespace about_flags |
OLD | NEW |