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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
923 SINGLE_VALUE_TYPE(switches::kEnableContacts) | 923 SINGLE_VALUE_TYPE(switches::kEnableContacts) |
924 }, | 924 }, |
925 #if defined(USE_ASH) | 925 #if defined(USE_ASH) |
926 { "ash-enable-advanced-gestures", | 926 { "ash-enable-advanced-gestures", |
927 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_NAME, | 927 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_NAME, |
928 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, | 928 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, |
929 kOsCrOS, | 929 kOsCrOS, |
930 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), | 930 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), |
931 }, | 931 }, |
932 #endif | 932 #endif |
933 #if defined(OS_CHROMEOS) | |
934 { | |
935 "enable-request-tablet-site", | |
936 IDS_ENABLE_REQUEST_TABLET_SITE_NAME, | |
sky
2012/09/07 22:54:16
Your name should match that of others in this file
sschmitz
2012/09/07 23:39:11
Done.
| |
937 IDS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION, | |
938 kOsCrOS | kOsLinux, | |
sky
2012/09/07 22:54:16
Remove kOsLinux here since you're ifdef is for chr
sschmitz
2012/09/07 23:39:11
Done.
| |
939 SINGLE_VALUE_TYPE(switches::kEnableRequestTabletSite) | |
940 }, | |
941 #endif | |
933 }; | 942 }; |
934 | 943 |
935 const Experiment* experiments = kExperiments; | 944 const Experiment* experiments = kExperiments; |
936 size_t num_experiments = arraysize(kExperiments); | 945 size_t num_experiments = arraysize(kExperiments); |
937 | 946 |
938 // Stores and encapsulates the little state that about:flags has. | 947 // Stores and encapsulates the little state that about:flags has. |
939 class FlagsState { | 948 class FlagsState { |
940 public: | 949 public: |
941 FlagsState() : needs_restart_(false) {} | 950 FlagsState() : needs_restart_(false) {} |
942 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); | 951 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1359 } | 1368 } |
1360 | 1369 |
1361 const Experiment* GetExperiments(size_t* count) { | 1370 const Experiment* GetExperiments(size_t* count) { |
1362 *count = num_experiments; | 1371 *count = num_experiments; |
1363 return experiments; | 1372 return experiments; |
1364 } | 1373 } |
1365 | 1374 |
1366 } // namespace testing | 1375 } // namespace testing |
1367 | 1376 |
1368 } // namespace about_flags | 1377 } // namespace about_flags |
OLD | NEW |