Chromium Code Reviews| 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 2577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2588 flag_descriptions::kEnableZipArchiverOnFileManagerName, | 2588 flag_descriptions::kEnableZipArchiverOnFileManagerName, |
| 2589 flag_descriptions::kEnableZipArchiverOnFileManagerDescription, kOsCrOS, | 2589 flag_descriptions::kEnableZipArchiverOnFileManagerDescription, kOsCrOS, |
| 2590 SINGLE_VALUE_TYPE(chromeos::switches::kEnableZipArchiverOnFileManager)}, | 2590 SINGLE_VALUE_TYPE(chromeos::switches::kEnableZipArchiverOnFileManager)}, |
| 2591 #endif // OS_CHROMEOS | 2591 #endif // OS_CHROMEOS |
| 2592 | 2592 |
| 2593 #if defined(OS_ANDROID) | 2593 #if defined(OS_ANDROID) |
| 2594 {"enable-copyless-paste", flag_descriptions::kEnableCopylessPasteName, | 2594 {"enable-copyless-paste", flag_descriptions::kEnableCopylessPasteName, |
| 2595 flag_descriptions::kEnableCopylessPasteDescription, kOsAndroid, | 2595 flag_descriptions::kEnableCopylessPasteDescription, kOsAndroid, |
| 2596 FEATURE_VALUE_TYPE(features::kCopylessPaste)}, | 2596 FEATURE_VALUE_TYPE(features::kCopylessPaste)}, |
| 2597 #endif | 2597 #endif |
| 2598 {"omnibox-display-title-for-current-url", | |
|
Mark P
2017/04/12 05:07:56
nit: blank line above, following convention of thi
gcomanici
2017/04/12 16:16:30
Done.
| |
| 2599 flag_descriptions::kOmniboxDisplayTitleForCurrentUrlName, | |
| 2600 flag_descriptions::kOmniboxDisplayTitleForCurrentUrlDescription, | |
| 2601 kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kDisplayTitleForCurrentUrl)}, | |
| 2598 | 2602 |
| 2599 // NOTE: Adding new command-line switches requires adding corresponding | 2603 // NOTE: Adding new command-line switches requires adding corresponding |
| 2600 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2604 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2601 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2605 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
|
Mark P
2017/04/12 05:07:56
Friendly reminder to remember to do this before at
| |
| 2602 }; | 2606 }; |
| 2603 | 2607 |
| 2604 class FlagsStateSingleton { | 2608 class FlagsStateSingleton { |
| 2605 public: | 2609 public: |
| 2606 FlagsStateSingleton() | 2610 FlagsStateSingleton() |
| 2607 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2611 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
| 2608 ~FlagsStateSingleton() {} | 2612 ~FlagsStateSingleton() {} |
| 2609 | 2613 |
| 2610 static FlagsStateSingleton* GetInstance() { | 2614 static FlagsStateSingleton* GetInstance() { |
| 2611 return base::Singleton<FlagsStateSingleton>::get(); | 2615 return base::Singleton<FlagsStateSingleton>::get(); |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2805 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2809 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2806 | 2810 |
| 2807 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2811 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2808 *count = arraysize(kFeatureEntries); | 2812 *count = arraysize(kFeatureEntries); |
| 2809 return kFeatureEntries; | 2813 return kFeatureEntries; |
| 2810 } | 2814 } |
| 2811 | 2815 |
| 2812 } // namespace testing | 2816 } // namespace testing |
| 2813 | 2817 |
| 2814 } // namespace about_flags | 2818 } // namespace about_flags |
| OLD | NEW |