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 1296 matching lines...) Loading... |
1307 }, | 1307 }, |
1308 { | 1308 { |
1309 "enable-input-view", | 1309 "enable-input-view", |
1310 IDS_FLAGS_ENABLE_INPUT_VIEW_NAME, | 1310 IDS_FLAGS_ENABLE_INPUT_VIEW_NAME, |
1311 IDS_FLAGS_ENABLE_INPUT_VIEW_DESCRIPTION, | 1311 IDS_FLAGS_ENABLE_INPUT_VIEW_DESCRIPTION, |
1312 kOsCrOS, | 1312 kOsCrOS, |
1313 ENABLE_DISABLE_VALUE_TYPE(keyboard::switches::kEnableInputView, | 1313 ENABLE_DISABLE_VALUE_TYPE(keyboard::switches::kEnableInputView, |
1314 keyboard::switches::kDisableInputView) | 1314 keyboard::switches::kDisableInputView) |
1315 }, | 1315 }, |
1316 { | 1316 { |
| 1317 "enable-experimental-ime-features", |
| 1318 IDS_FLAGS_ENABLE_EXPERIMENTAL_IME_FEATURES_NAME, |
| 1319 IDS_FLAGS_ENABLE_EXPERIMENTAL_IME_FEATURES_DESCRIPTION, |
| 1320 kOsCrOS, |
| 1321 SINGLE_VALUE_TYPE(chromeos::switches::kEnableExperimentalImeFeatures) |
| 1322 }, |
| 1323 { |
1317 "enable-experimental-input-view-features", | 1324 "enable-experimental-input-view-features", |
1318 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME, | 1325 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME, |
1319 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, | 1326 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, |
1320 kOsCrOS, | 1327 kOsCrOS, |
1321 SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures) | 1328 SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures) |
1322 }, | 1329 }, |
1323 #if defined(ENABLE_EXTENSIONS) | 1330 #if defined(ENABLE_EXTENSIONS) |
1324 { | 1331 { |
1325 "enable-extension-info-dialog", | 1332 "enable-extension-info-dialog", |
1326 IDS_FLAGS_ENABLE_EXTENSION_INFO_DIALOG_NAME, | 1333 IDS_FLAGS_ENABLE_EXTENSION_INFO_DIALOG_NAME, |
(...skipping 1237 matching lines...) Loading... |
2564 } | 2571 } |
2565 | 2572 |
2566 const Experiment* GetExperiments(size_t* count) { | 2573 const Experiment* GetExperiments(size_t* count) { |
2567 *count = num_experiments; | 2574 *count = num_experiments; |
2568 return experiments; | 2575 return experiments; |
2569 } | 2576 } |
2570 | 2577 |
2571 } // namespace testing | 2578 } // namespace testing |
2572 | 2579 |
2573 } // namespace about_flags | 2580 } // namespace about_flags |
OLD | NEW |