| 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 2399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2410 {"enable-mojo-loading", IDS_FLAGS_MOJO_LOADING_NAME, | 2410 {"enable-mojo-loading", IDS_FLAGS_MOJO_LOADING_NAME, |
| 2411 IDS_FLAGS_MOJO_LOADING_DESCRIPTION, kOsAll, | 2411 IDS_FLAGS_MOJO_LOADING_DESCRIPTION, kOsAll, |
| 2412 FEATURE_VALUE_TYPE(features::kLoadingWithMojo)}, | 2412 FEATURE_VALUE_TYPE(features::kLoadingWithMojo)}, |
| 2413 | 2413 |
| 2414 #if defined(OS_CHROMEOS) | 2414 #if defined(OS_CHROMEOS) |
| 2415 {"force-tablet-mode", IDS_FLAGS_FORCE_TABLET_MODE_NAME, | 2415 {"force-tablet-mode", IDS_FLAGS_FORCE_TABLET_MODE_NAME, |
| 2416 IDS_FLAGS_FORCE_TABLET_MODE_DESCRIPTION, kOsCrOS, | 2416 IDS_FLAGS_FORCE_TABLET_MODE_DESCRIPTION, kOsCrOS, |
| 2417 MULTI_VALUE_TYPE(kForceTabletModeChoices)}, | 2417 MULTI_VALUE_TYPE(kForceTabletModeChoices)}, |
| 2418 #endif // OS_CHROMEOS | 2418 #endif // OS_CHROMEOS |
| 2419 | 2419 |
| 2420 #if defined(OS_ANDROID) |
| 2421 {"use-new-doodle-api", IDS_FLAGS_USE_NEW_DOODLE_API_NAME, |
| 2422 IDS_FLAGS_USE_NEW_DOODLE_API_DESCRIPTION, kOsAndroid, |
| 2423 FEATURE_VALUE_TYPE(chrome::android::kUseNewDoodleApi)}, |
| 2424 #endif // OS_ANDROID |
| 2425 |
| 2420 // NOTE: Adding new command-line switches requires adding corresponding | 2426 // NOTE: Adding new command-line switches requires adding corresponding |
| 2421 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2427 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2422 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2428 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2423 }; | 2429 }; |
| 2424 | 2430 |
| 2425 class FlagsStateSingleton { | 2431 class FlagsStateSingleton { |
| 2426 public: | 2432 public: |
| 2427 FlagsStateSingleton() | 2433 FlagsStateSingleton() |
| 2428 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2434 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
| 2429 ~FlagsStateSingleton() {} | 2435 ~FlagsStateSingleton() {} |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2618 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2624 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2619 | 2625 |
| 2620 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2626 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2621 *count = arraysize(kFeatureEntries); | 2627 *count = arraysize(kFeatureEntries); |
| 2622 return kFeatureEntries; | 2628 return kFeatureEntries; |
| 2623 } | 2629 } |
| 2624 | 2630 |
| 2625 } // namespace testing | 2631 } // namespace testing |
| 2626 | 2632 |
| 2627 } // namespace about_flags | 2633 } // namespace about_flags |
| OLD | NEW |