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