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 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
862 SINGLE_VALUE_TYPE(switches::kEnableSlimmingPaint) | 862 SINGLE_VALUE_TYPE(switches::kEnableSlimmingPaint) |
863 }, | 863 }, |
864 { | 864 { |
865 "enable-experimental-web-platform-features", | 865 "enable-experimental-web-platform-features", |
866 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME, | 866 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME, |
867 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, | 867 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, |
868 kOsAll, | 868 kOsAll, |
869 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures) | 869 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures) |
870 }, | 870 }, |
871 { | 871 { |
| 872 "enable-web-bluetooth", |
| 873 IDS_FLAGS_WEB_BLUETOOTH_NAME, |
| 874 IDS_FLAGS_WEB_BLUETOOTH_DESCRIPTION, |
| 875 kOsAll, |
| 876 SINGLE_VALUE_TYPE(switches::kEnableWebBluetooth) |
| 877 }, |
| 878 { |
872 "disable-ntp-other-sessions-menu", | 879 "disable-ntp-other-sessions-menu", |
873 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, | 880 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, |
874 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, | 881 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, |
875 kOsDesktop, | 882 kOsDesktop, |
876 SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) | 883 SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) |
877 }, | 884 }, |
878 { | 885 { |
879 "enable-devtools-experiments", | 886 "enable-devtools-experiments", |
880 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, | 887 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, |
881 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION, | 888 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION, |
(...skipping 2135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3017 } | 3024 } |
3018 | 3025 |
3019 const Experiment* GetExperiments(size_t* count) { | 3026 const Experiment* GetExperiments(size_t* count) { |
3020 *count = num_experiments; | 3027 *count = num_experiments; |
3021 return experiments; | 3028 return experiments; |
3022 } | 3029 } |
3023 | 3030 |
3024 } // namespace testing | 3031 } // namespace testing |
3025 | 3032 |
3026 } // namespace about_flags | 3033 } // namespace about_flags |
OLD | NEW |