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 2380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2391 {"enable-mojo-loading", IDS_FLAGS_MOJO_LOADING_NAME, | 2391 {"enable-mojo-loading", IDS_FLAGS_MOJO_LOADING_NAME, |
2392 IDS_FLAGS_MOJO_LOADING_DESCRIPTION, kOsAll, | 2392 IDS_FLAGS_MOJO_LOADING_DESCRIPTION, kOsAll, |
2393 FEATURE_VALUE_TYPE(features::kLoadingWithMojo)}, | 2393 FEATURE_VALUE_TYPE(features::kLoadingWithMojo)}, |
2394 | 2394 |
2395 #if defined(OS_CHROMEOS) | 2395 #if defined(OS_CHROMEOS) |
2396 {"force-tablet-mode", IDS_FLAGS_FORCE_TABLET_MODE_NAME, | 2396 {"force-tablet-mode", IDS_FLAGS_FORCE_TABLET_MODE_NAME, |
2397 IDS_FLAGS_FORCE_TABLET_MODE_DESCRIPTION, kOsCrOS, | 2397 IDS_FLAGS_FORCE_TABLET_MODE_DESCRIPTION, kOsCrOS, |
2398 MULTI_VALUE_TYPE(kForceTabletModeChoices)}, | 2398 MULTI_VALUE_TYPE(kForceTabletModeChoices)}, |
2399 #endif // OS_CHROMEOS | 2399 #endif // OS_CHROMEOS |
2400 | 2400 |
| 2401 #if defined(OS_ANDROID) |
| 2402 {"enable-custom-context-menu", IDS_FLAGS_ENABLE_CUSTOM_CONTEXT_MENU_NAME, |
| 2403 IDS_FLAGS_ENABLE_CUSTOM_CONTEXT_MENU_DESCRIPTION, kOsAndroid, |
| 2404 FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, |
| 2405 #endif // OS_ANDROID |
| 2406 |
2401 // NOTE: Adding new command-line switches requires adding corresponding | 2407 // NOTE: Adding new command-line switches requires adding corresponding |
2402 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2408 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2403 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2409 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2404 }; | 2410 }; |
2405 | 2411 |
2406 class FlagsStateSingleton { | 2412 class FlagsStateSingleton { |
2407 public: | 2413 public: |
2408 FlagsStateSingleton() | 2414 FlagsStateSingleton() |
2409 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2415 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2410 ~FlagsStateSingleton() {} | 2416 ~FlagsStateSingleton() {} |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2599 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2605 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2600 | 2606 |
2601 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2607 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2602 *count = arraysize(kFeatureEntries); | 2608 *count = arraysize(kFeatureEntries); |
2603 return kFeatureEntries; | 2609 return kFeatureEntries; |
2604 } | 2610 } |
2605 | 2611 |
2606 } // namespace testing | 2612 } // namespace testing |
2607 | 2613 |
2608 } // namespace about_flags | 2614 } // namespace about_flags |
OLD | NEW |