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 "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "chromeos/ime/input_method_descriptor.h" | 10 #include "chromeos/ime/input_method_descriptor.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 std::vector<std::string> languages; | 40 std::vector<std::string> languages; |
41 Tokenize(kInputMethods[i].language_code, kLanguageDelimiter, &languages); | 41 Tokenize(kInputMethods[i].language_code, kLanguageDelimiter, &languages); |
42 DCHECK(!languages.empty()); | 42 DCHECK(!languages.empty()); |
43 | 43 |
44 input_methods->push_back(InputMethodDescriptor( | 44 input_methods->push_back(InputMethodDescriptor( |
45 kInputMethods[i].input_method_id, | 45 kInputMethods[i].input_method_id, |
46 "", | 46 "", |
47 layouts, | 47 layouts, |
48 languages, | 48 languages, |
| 49 kInputMethods[i].is_login_keyboard, |
49 GURL())); // options page url, not available for non-extension input | 50 GURL())); // options page url, not available for non-extension input |
50 // method. | 51 // method. |
51 } | 52 } |
52 return input_methods.Pass(); | 53 return input_methods.Pass(); |
53 } | 54 } |
54 | 55 |
55 } // namespace input_method | 56 } // namespace input_method |
56 } // namespace chromeos | 57 } // namespace chromeos |
OLD | NEW |