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 2311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2322 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, | 2322 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, |
2323 | 2323 |
2324 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ | 2324 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ |
2325 defined(OS_WIN) | 2325 defined(OS_WIN) |
2326 {"omnibox-entity-suggestions", IDS_FLAGS_OMNIBOX_ENTITY_SUGGESTIONS_NAME, | 2326 {"omnibox-entity-suggestions", IDS_FLAGS_OMNIBOX_ENTITY_SUGGESTIONS_NAME, |
2327 IDS_FLAGS_OMNIBOX_ENTITY_SUGGESTIONS_DESCRIPTION, kOsDesktop, | 2327 IDS_FLAGS_OMNIBOX_ENTITY_SUGGESTIONS_DESCRIPTION, kOsDesktop, |
2328 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, | 2328 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, |
2329 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || | 2329 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || |
2330 // defined(OS_WIN) | 2330 // defined(OS_WIN) |
2331 | 2331 |
| 2332 #if defined(OS_ANDROID) |
| 2333 {"enable-custom-feedback-ui", IDS_FLAGS_ENABLE_CUSTOM_FEEDBACK_UI_NAME, |
| 2334 IDS_FLAGS_ENABLE_CUSTOM_FEEDBACK_UI_DESCRIPTION, kOsAndroid, |
| 2335 FEATURE_VALUE_TYPE(chrome::android::kCustomFeedbackUi)}, |
| 2336 #endif // OS_ANDROID |
| 2337 |
2332 // NOTE: Adding new command-line switches requires adding corresponding | 2338 // NOTE: Adding new command-line switches requires adding corresponding |
2333 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2339 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2334 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2340 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2335 }; | 2341 }; |
2336 | 2342 |
2337 class FlagsStateSingleton { | 2343 class FlagsStateSingleton { |
2338 public: | 2344 public: |
2339 FlagsStateSingleton() | 2345 FlagsStateSingleton() |
2340 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2346 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2341 ~FlagsStateSingleton() {} | 2347 ~FlagsStateSingleton() {} |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2530 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2536 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2531 | 2537 |
2532 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2538 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2533 *count = arraysize(kFeatureEntries); | 2539 *count = arraysize(kFeatureEntries); |
2534 return kFeatureEntries; | 2540 return kFeatureEntries; |
2535 } | 2541 } |
2536 | 2542 |
2537 } // namespace testing | 2543 } // namespace testing |
2538 | 2544 |
2539 } // namespace about_flags | 2545 } // namespace about_flags |
OLD | NEW |