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 2751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2762 {"enable-clipboard-provider", | 2762 {"enable-clipboard-provider", |
2763 flag_descriptions::kEnableOmniboxClipboardProviderName, | 2763 flag_descriptions::kEnableOmniboxClipboardProviderName, |
2764 flag_descriptions::kEnableOmniboxClipboardProviderDescription, kOsAndroid, | 2764 flag_descriptions::kEnableOmniboxClipboardProviderDescription, kOsAndroid, |
2765 FEATURE_VALUE_TYPE(omnibox::kEnableClipboardProvider)}, | 2765 FEATURE_VALUE_TYPE(omnibox::kEnableClipboardProvider)}, |
2766 #endif | 2766 #endif |
2767 | 2767 |
2768 {"autoplay-policy", flag_descriptions::kAutoplayPolicyName, | 2768 {"autoplay-policy", flag_descriptions::kAutoplayPolicyName, |
2769 flag_descriptions::kAutoplayPolicyDescription, kOsAll, | 2769 flag_descriptions::kAutoplayPolicyDescription, kOsAll, |
2770 MULTI_VALUE_TYPE(kAutoplayPolicyChoices)}, | 2770 MULTI_VALUE_TYPE(kAutoplayPolicyChoices)}, |
2771 | 2771 |
| 2772 #if defined(OS_CHROMEOS) |
| 2773 {"enable-scalable-views", flag_descriptions::kEnableScalableViewsName, |
| 2774 flag_descriptions::kEnableScalableViewsDescription, kOsCrOS, |
| 2775 SINGLE_VALUE_TYPE(chromeos::switches::kEnableScalableViews)}, |
| 2776 #endif // defined(OS_CHROMEOS) |
| 2777 |
2772 // NOTE: Adding new command-line switches requires adding corresponding | 2778 // NOTE: Adding new command-line switches requires adding corresponding |
2773 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2779 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2774 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2780 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2775 }; | 2781 }; |
2776 | 2782 |
2777 class FlagsStateSingleton { | 2783 class FlagsStateSingleton { |
2778 public: | 2784 public: |
2779 FlagsStateSingleton() | 2785 FlagsStateSingleton() |
2780 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2786 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2781 ~FlagsStateSingleton() {} | 2787 ~FlagsStateSingleton() {} |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2987 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2993 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2988 | 2994 |
2989 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2995 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2990 *count = arraysize(kFeatureEntries); | 2996 *count = arraysize(kFeatureEntries); |
2991 return kFeatureEntries; | 2997 return kFeatureEntries; |
2992 } | 2998 } |
2993 | 2999 |
2994 } // namespace testing | 3000 } // namespace testing |
2995 | 3001 |
2996 } // namespace about_flags | 3002 } // namespace about_flags |
OLD | NEW |