| 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/chromeos/input_method/input_method_engine_ibus.h" | 5 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 // TODO(komatsu): Move this logic to InputMethodManager. | 79 // TODO(komatsu): Move this logic to InputMethodManager. |
| 80 if (IBusBridge::Get()->GetEngineHandler() == this) | 80 if (IBusBridge::Get()->GetEngineHandler() == this) |
| 81 IBusBridge::Get()->SetEngineHandler(NULL); | 81 IBusBridge::Get()->SetEngineHandler(NULL); |
| 82 } | 82 } |
| 83 | 83 |
| 84 void InputMethodEngineIBus::Initialize( | 84 void InputMethodEngineIBus::Initialize( |
| 85 InputMethodEngine::Observer* observer, | 85 InputMethodEngine::Observer* observer, |
| 86 const char* engine_name, | 86 const char* engine_name, |
| 87 const char* extension_id, | 87 const char* extension_id, |
| 88 const char* engine_id, | 88 const char* engine_id, |
| 89 const char* description, | |
| 90 const std::vector<std::string>& languages, | 89 const std::vector<std::string>& languages, |
| 91 const std::vector<std::string>& layouts, | 90 const std::vector<std::string>& layouts, |
| 92 const GURL& options_page, | 91 const GURL& options_page, |
| 93 const GURL& input_view, | 92 const GURL& input_view) { |
| 94 std::string* error) { | |
| 95 DCHECK(observer) << "Observer must not be null."; | 93 DCHECK(observer) << "Observer must not be null."; |
| 96 | 94 |
| 97 observer_ = observer; | 95 observer_ = observer; |
| 98 engine_id_ = engine_id; | 96 engine_id_ = engine_id; |
| 99 | 97 |
| 100 input_method::InputMethodManager* manager = | 98 input_method::InputMethodManager* manager = |
| 101 input_method::InputMethodManager::Get(); | 99 input_method::InputMethodManager::Get(); |
| 102 ComponentExtensionIMEManager* comp_ext_ime_manager | 100 ComponentExtensionIMEManager* comp_ext_ime_manager |
| 103 = manager->GetComponentExtensionIMEManager(); | 101 = manager->GetComponentExtensionIMEManager(); |
| 104 | 102 |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 // TODO(nona): Implement it. | 577 // TODO(nona): Implement it. |
| 580 break; | 578 break; |
| 581 } | 579 } |
| 582 } | 580 } |
| 583 } | 581 } |
| 584 | 582 |
| 585 // TODO(nona): Support item.children. | 583 // TODO(nona): Support item.children. |
| 586 } | 584 } |
| 587 | 585 |
| 588 } // namespace chromeos | 586 } // namespace chromeos |
| OLD | NEW |