| 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 2085 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2096 IDS_FLAGS_CROSS_PROCESS_GUEST_VIEW_ISOLATION_DESCRIPTION, kOsDesktop, | 2096 IDS_FLAGS_CROSS_PROCESS_GUEST_VIEW_ISOLATION_DESCRIPTION, kOsDesktop, |
| 2097 FEATURE_VALUE_TYPE(features::kGuestViewCrossProcessFrames)}, | 2097 FEATURE_VALUE_TYPE(features::kGuestViewCrossProcessFrames)}, |
| 2098 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 2098 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 2099 {"media-remoting", IDS_FLAGS_MEDIA_REMOTING_NAME, | 2099 {"media-remoting", IDS_FLAGS_MEDIA_REMOTING_NAME, |
| 2100 IDS_FLAGS_MEDIA_REMOTING_DESCRIPTION, kOsDesktop, | 2100 IDS_FLAGS_MEDIA_REMOTING_DESCRIPTION, kOsDesktop, |
| 2101 FEATURE_VALUE_TYPE(features::kMediaRemoting)}, | 2101 FEATURE_VALUE_TYPE(features::kMediaRemoting)}, |
| 2102 {"media-remoting-encrypted", IDS_FLAGS_MEDIA_REMOTING_ENCRYPTED_NAME, | 2102 {"media-remoting-encrypted", IDS_FLAGS_MEDIA_REMOTING_ENCRYPTED_NAME, |
| 2103 IDS_FLAGS_MEDIA_REMOTING_ENCRYPTED_DESCRIPTION, kOsDesktop, | 2103 IDS_FLAGS_MEDIA_REMOTING_ENCRYPTED_DESCRIPTION, kOsDesktop, |
| 2104 FEATURE_VALUE_TYPE(features::kMediaRemotingEncrypted)}, | 2104 FEATURE_VALUE_TYPE(features::kMediaRemotingEncrypted)}, |
| 2105 #endif | 2105 #endif |
| 2106 #if defined(OS_ANDROID) |
| 2107 {"video-fullscreen-orientation-lock", |
| 2108 IDS_FLAGS_VIDEO_FULLSCREEN_ORIENTATION_LOCK_NAME, |
| 2109 IDS_FLAGS_VIDEO_FULLSCREEN_ORIENTATION_LOCK_DESCRIPTION, kOsAndroid, |
| 2110 FEATURE_VALUE_TYPE(media::kVideoFullscreenOrientationLock)}, |
| 2111 #endif |
| 2106 | 2112 |
| 2107 // NOTE: Adding new command-line switches requires adding corresponding | 2113 // NOTE: Adding new command-line switches requires adding corresponding |
| 2108 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2114 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2109 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2115 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2110 }; | 2116 }; |
| 2111 | 2117 |
| 2112 class FlagsStateSingleton { | 2118 class FlagsStateSingleton { |
| 2113 public: | 2119 public: |
| 2114 FlagsStateSingleton() | 2120 FlagsStateSingleton() |
| 2115 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2121 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2305 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2311 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2306 | 2312 |
| 2307 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2313 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2308 *count = arraysize(kFeatureEntries); | 2314 *count = arraysize(kFeatureEntries); |
| 2309 return kFeatureEntries; | 2315 return kFeatureEntries; |
| 2310 } | 2316 } |
| 2311 | 2317 |
| 2312 } // namespace testing | 2318 } // namespace testing |
| 2313 | 2319 |
| 2314 } // namespace about_flags | 2320 } // namespace about_flags |
| OLD | NEW |