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 2050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2061 #endif // OS_CHROMEOS | 2061 #endif // OS_CHROMEOS |
2062 #if !defined(OS_ANDROID) | 2062 #if !defined(OS_ANDROID) |
2063 {"enable-default-media-session", | 2063 {"enable-default-media-session", |
2064 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_NAME, | 2064 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_NAME, |
2065 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DESCRIPTION, kOsDesktop, | 2065 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DESCRIPTION, kOsDesktop, |
2066 MULTI_VALUE_TYPE(kEnableDefaultMediaSessionChoices)}, | 2066 MULTI_VALUE_TYPE(kEnableDefaultMediaSessionChoices)}, |
2067 #endif // !defined(OS_ANDROID) | 2067 #endif // !defined(OS_ANDROID) |
2068 // NOTE: Adding new command-line switches requires adding corresponding | 2068 // NOTE: Adding new command-line switches requires adding corresponding |
2069 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2069 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2070 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2070 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2071 #if defined(OS_LINUX) |
| 2072 {"enable-xdpi-for-dsf", IDS_FLAGS_ENABLE_XDPI_FOR_DSF_NAME, |
| 2073 IDS_FLAGS_ENABLE_XDPI_FOR_DSF_DESCRIPTION, kOsLinux, |
| 2074 SINGLE_VALUE_TYPE(switches::kEnableXDpiForDsf)}, |
| 2075 #endif // OS_LINUX |
2071 }; | 2076 }; |
2072 | 2077 |
2073 class FlagsStateSingleton { | 2078 class FlagsStateSingleton { |
2074 public: | 2079 public: |
2075 FlagsStateSingleton() | 2080 FlagsStateSingleton() |
2076 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2081 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2077 ~FlagsStateSingleton() {} | 2082 ~FlagsStateSingleton() {} |
2078 | 2083 |
2079 static FlagsStateSingleton* GetInstance() { | 2084 static FlagsStateSingleton* GetInstance() { |
2080 return base::Singleton<FlagsStateSingleton>::get(); | 2085 return base::Singleton<FlagsStateSingleton>::get(); |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2266 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2271 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2267 | 2272 |
2268 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2273 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2269 *count = arraysize(kFeatureEntries); | 2274 *count = arraysize(kFeatureEntries); |
2270 return kFeatureEntries; | 2275 return kFeatureEntries; |
2271 } | 2276 } |
2272 | 2277 |
2273 } // namespace testing | 2278 } // namespace testing |
2274 | 2279 |
2275 } // namespace about_flags | 2280 } // namespace about_flags |
OLD | NEW |