| 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 "chrome/browser/chromeos/input_method/input_method_engine.h" | 5 #include "chrome/browser/chromeos/input_method/input_method_engine.h" |
| 6 | 6 |
| 7 #define XK_MISCELLANY | 7 #define XK_MISCELLANY |
| 8 #include <X11/keysymdef.h> | 8 #include <X11/keysymdef.h> |
| 9 #include <X11/X.h> | 9 #include <X11/X.h> |
| 10 #include <X11/Xlib.h> | 10 #include <X11/Xlib.h> |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 imm_id_ = extension_ime_util::GetInputMethodID(extension_id, engine_id); | 99 imm_id_ = extension_ime_util::GetInputMethodID(extension_id, engine_id); |
| 100 } | 100 } |
| 101 | 101 |
| 102 input_view_url_ = input_view; | 102 input_view_url_ = input_view; |
| 103 descriptor_ = input_method::InputMethodDescriptor( | 103 descriptor_ = input_method::InputMethodDescriptor( |
| 104 imm_id_, | 104 imm_id_, |
| 105 engine_name, | 105 engine_name, |
| 106 std::string(), // TODO(uekawa): Set short name. | 106 std::string(), // TODO(uekawa): Set short name. |
| 107 layouts, | 107 layouts, |
| 108 languages, | 108 languages, |
| 109 false, // is_login_keyboard | 109 extension_ime_util::IsKeyboardLayoutExtension( |
| 110 imm_id_), // is_login_keyboard |
| 110 options_page, | 111 options_page, |
| 111 input_view); | 112 input_view); |
| 112 | 113 |
| 113 // TODO(komatsu): It is probably better to call AddInputMethodExtension | 114 // TODO(komatsu): It is probably better to call AddInputMethodExtension |
| 114 // out of Initialize. | 115 // out of Initialize. |
| 115 manager->AddInputMethodExtension(imm_id_, this); | 116 manager->AddInputMethodExtension(imm_id_, this); |
| 116 } | 117 } |
| 117 | 118 |
| 118 const input_method::InputMethodDescriptor& InputMethodEngine::GetDescriptor() | 119 const input_method::InputMethodDescriptor& InputMethodEngine::GetDescriptor() |
| 119 const { | 120 const { |
| (...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 // TODO(nona): Implement it. | 632 // TODO(nona): Implement it. |
| 632 break; | 633 break; |
| 633 } | 634 } |
| 634 } | 635 } |
| 635 } | 636 } |
| 636 | 637 |
| 637 // TODO(nona): Support item.children. | 638 // TODO(nona): Support item.children. |
| 638 } | 639 } |
| 639 | 640 |
| 640 } // namespace chromeos | 641 } // namespace chromeos |
| OLD | NEW |