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 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1274 SINGLE_VALUE_TYPE(chromeos::switches::kEnablePhysicalKeyboardAutocorrect) | 1274 SINGLE_VALUE_TYPE(chromeos::switches::kEnablePhysicalKeyboardAutocorrect) |
1275 }, | 1275 }, |
1276 { | 1276 { |
1277 "enable-experimental-input-view-features", | 1277 "enable-experimental-input-view-features", |
1278 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME, | 1278 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME, |
1279 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, | 1279 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, |
1280 kOsCrOS, | 1280 kOsCrOS, |
1281 SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures) | 1281 SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures) |
1282 }, | 1282 }, |
1283 { | 1283 { |
1284 "disable-smart-virtual-keyboard", | 1284 "auto-virtual-keyboard", |
1285 IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_NAME, | 1285 IDS_FLAGS_AUTO_VIRTUAL_KEYBOARD_NAME, |
sky
2015/01/07 23:33:27
You should rename the grd fields too, eg IDS_FLAGS
rsadam
2015/01/08 15:36:33
Done.
| |
1286 IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_DESCRIPTION, | 1286 IDS_FLAGS_AUTO_VIRTUAL_KEYBOARD_DESCRIPTION, |
1287 kOsCrOS, | 1287 kOsCrOS, |
1288 SINGLE_VALUE_TYPE(keyboard::switches::kDisableSmartVirtualKeyboard) | 1288 SINGLE_VALUE_TYPE(keyboard::switches::kAutoVirtualKeyboard) |
sky
2015/01/07 23:33:27
Where does this come from? Don't you need kEnableA
rsadam
2015/01/08 15:36:33
I completely missed this when renaming. I'm surpri
| |
1289 }, | 1289 }, |
1290 #endif | 1290 #endif |
1291 { | 1291 { |
1292 "enable-simple-cache-backend", | 1292 "enable-simple-cache-backend", |
1293 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME, | 1293 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME, |
1294 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION, | 1294 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION, |
1295 kOsWin | kOsMac | kOsLinux | kOsCrOS, | 1295 kOsWin | kOsMac | kOsLinux | kOsCrOS, |
1296 MULTI_VALUE_TYPE(kSimpleCacheBackendChoices) | 1296 MULTI_VALUE_TYPE(kSimpleCacheBackendChoices) |
1297 }, | 1297 }, |
1298 { | 1298 { |
(...skipping 1369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2668 } | 2668 } |
2669 | 2669 |
2670 const Experiment* GetExperiments(size_t* count) { | 2670 const Experiment* GetExperiments(size_t* count) { |
2671 *count = num_experiments; | 2671 *count = num_experiments; |
2672 return experiments; | 2672 return experiments; |
2673 } | 2673 } |
2674 | 2674 |
2675 } // namespace testing | 2675 } // namespace testing |
2676 | 2676 |
2677 } // namespace about_flags | 2677 } // namespace about_flags |
OLD | NEW |