| 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 <map> | 9 #include <map> |
| 10 | 10 |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/string_util.h" | 13 #include "base/string_util.h" |
| 14 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
| 15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 16 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
| 17 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | |
| 18 #include "chromeos/dbus/dbus_thread_manager.h" | 17 #include "chromeos/dbus/dbus_thread_manager.h" |
| 19 #include "chromeos/dbus/ibus/ibus_client.h" | 18 #include "chromeos/dbus/ibus/ibus_client.h" |
| 20 #include "chromeos/dbus/ibus/ibus_component.h" | 19 #include "chromeos/dbus/ibus/ibus_component.h" |
| 21 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h" | 20 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h" |
| 22 #include "chromeos/dbus/ibus/ibus_engine_service.h" | 21 #include "chromeos/dbus/ibus/ibus_engine_service.h" |
| 23 #include "chromeos/dbus/ibus/ibus_lookup_table.h" | 22 #include "chromeos/dbus/ibus/ibus_lookup_table.h" |
| 24 #include "chromeos/dbus/ibus/ibus_property.h" | 23 #include "chromeos/dbus/ibus/ibus_property.h" |
| 25 #include "chromeos/dbus/ibus/ibus_text.h" | 24 #include "chromeos/dbus/ibus/ibus_text.h" |
| 26 #include "chromeos/ime/component_extension_ime_manager.h" | 25 #include "chromeos/ime/component_extension_ime_manager.h" |
| 27 #include "chromeos/ime/extension_ime_util.h" | 26 #include "chromeos/ime/extension_ime_util.h" |
| 28 #include "chromeos/ime/ibus_keymap.h" | 27 #include "chromeos/ime/ibus_keymap.h" |
| 28 #include "chromeos/ime/input_method_manager.h" |
| 29 #include "dbus/object_path.h" | 29 #include "dbus/object_path.h" |
| 30 | 30 |
| 31 namespace chromeos { | 31 namespace chromeos { |
| 32 const char* kErrorNotActive = "IME is not active"; | 32 const char* kErrorNotActive = "IME is not active"; |
| 33 const char* kErrorWrongContext = "Context is not active"; | 33 const char* kErrorWrongContext = "Context is not active"; |
| 34 const char* kCandidateNotFound = "Candidate not found"; | 34 const char* kCandidateNotFound = "Candidate not found"; |
| 35 const char* kEngineBusPrefix = "org.freedesktop.IBus."; | 35 const char* kEngineBusPrefix = "org.freedesktop.IBus."; |
| 36 const char* kObjectPathPrefix = "/org/freedesktop/IBus/Engine/"; | 36 const char* kObjectPathPrefix = "/org/freedesktop/IBus/Engine/"; |
| 37 | 37 |
| 38 namespace { | 38 namespace { |
| (...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 DBusThreadManager::Get()->RemoveIBusEngineService(object_path_); | 606 DBusThreadManager::Get()->RemoveIBusEngineService(object_path_); |
| 607 | 607 |
| 608 current_object_path_++; | 608 current_object_path_++; |
| 609 object_path_ = dbus::ObjectPath(kObjectPathPrefix + | 609 object_path_ = dbus::ObjectPath(kObjectPathPrefix + |
| 610 base::IntToString(current_object_path_)); | 610 base::IntToString(current_object_path_)); |
| 611 GetCurrentService()->SetEngine(this); | 611 GetCurrentService()->SetEngine(this); |
| 612 sender.Run(object_path_); | 612 sender.Run(object_path_); |
| 613 } | 613 } |
| 614 | 614 |
| 615 } // namespace chromeos | 615 } // namespace chromeos |
| OLD | NEW |