| 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 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 880 "touch-events", | 880 "touch-events", |
| 881 IDS_TOUCH_EVENTS_NAME, | 881 IDS_TOUCH_EVENTS_NAME, |
| 882 IDS_TOUCH_EVENTS_DESCRIPTION, | 882 IDS_TOUCH_EVENTS_DESCRIPTION, |
| 883 kOsDesktop, | 883 kOsDesktop, |
| 884 MULTI_VALUE_TYPE(kTouchEventsChoices) | 884 MULTI_VALUE_TYPE(kTouchEventsChoices) |
| 885 }, | 885 }, |
| 886 { | 886 { |
| 887 "disable-touch-adjustment", | 887 "disable-touch-adjustment", |
| 888 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, | 888 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, |
| 889 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, | 889 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 890 kOsWin | kOsLinux | kOsCrOS, | 890 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| 891 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) | 891 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) |
| 892 }, | 892 }, |
| 893 #if defined(OS_CHROMEOS) | 893 #if defined(OS_CHROMEOS) |
| 894 { | 894 { |
| 895 "network-portal-notification", | 895 "network-portal-notification", |
| 896 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, | 896 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, |
| 897 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, | 897 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, |
| 898 kOsCrOS, | 898 kOsCrOS, |
| 899 ENABLE_DISABLE_VALUE_TYPE( | 899 ENABLE_DISABLE_VALUE_TYPE( |
| 900 chromeos::switches::kEnableNetworkPortalNotification, | 900 chromeos::switches::kEnableNetworkPortalNotification, |
| (...skipping 1607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2508 } | 2508 } |
| 2509 | 2509 |
| 2510 const Experiment* GetExperiments(size_t* count) { | 2510 const Experiment* GetExperiments(size_t* count) { |
| 2511 *count = num_experiments; | 2511 *count = num_experiments; |
| 2512 return experiments; | 2512 return experiments; |
| 2513 } | 2513 } |
| 2514 | 2514 |
| 2515 } // namespace testing | 2515 } // namespace testing |
| 2516 | 2516 |
| 2517 } // namespace about_flags | 2517 } // namespace about_flags |
| OLD | NEW |