OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chromeos/ime/input_method_whitelist.h" | 5 #include "chromeos/ime/input_method_whitelist.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "chromeos/ime/input_method_descriptor.h" | 9 #include "chromeos/ime/input_method_descriptor.h" |
10 #include "chromeos/ime/input_methods.h" | 10 #include "chromeos/ime/input_methods.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 scoped_ptr<InputMethodDescriptors> | 29 scoped_ptr<InputMethodDescriptors> |
30 InputMethodWhitelist::GetSupportedInputMethods() const { | 30 InputMethodWhitelist::GetSupportedInputMethods() const { |
31 scoped_ptr<InputMethodDescriptors> input_methods(new InputMethodDescriptors); | 31 scoped_ptr<InputMethodDescriptors> input_methods(new InputMethodDescriptors); |
32 input_methods->reserve(arraysize(kInputMethods)); | 32 input_methods->reserve(arraysize(kInputMethods)); |
33 for (size_t i = 0; i < arraysize(kInputMethods); ++i) { | 33 for (size_t i = 0; i < arraysize(kInputMethods); ++i) { |
34 input_methods->push_back(InputMethodDescriptor( | 34 input_methods->push_back(InputMethodDescriptor( |
35 kInputMethods[i].input_method_id, | 35 kInputMethods[i].input_method_id, |
36 "", | 36 "", |
37 kInputMethods[i].xkb_layout_id, | 37 kInputMethods[i].xkb_layout_id, |
38 kInputMethods[i].language_code, | 38 kInputMethods[i].language_code, |
| 39 "", // options page url, not available for non-extension input method. |
39 false)); | 40 false)); |
40 } | 41 } |
41 return input_methods.Pass(); | 42 return input_methods.Pass(); |
42 } | 43 } |
43 | 44 |
44 } // namespace input_method | 45 } // namespace input_method |
45 } // namespace chromeos | 46 } // namespace chromeos |
OLD | NEW |