Commit 3f4fdd42 authored by komatsu@chromium.org's avatar komatsu@chromium.org

There are two implementations for IBusEngineService, IBusEngineServiceImpl and

IBusEngineServiceDaemonlessImpl.  This CL deletes IBusEngineServiceImpl which is
no longer used.

BUG=275262

Review URL: https://chromiumcodereview.appspot.com/23766008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221660 0039d316-1c4b-4281-b951-d872f2087c98
parent 4fce48c6
...@@ -485,7 +485,6 @@ ...@@ -485,7 +485,6 @@
'dbus/ibus/ibus_client_unittest.cc', 'dbus/ibus/ibus_client_unittest.cc',
'dbus/ibus/ibus_component_unittest.cc', 'dbus/ibus/ibus_component_unittest.cc',
'dbus/ibus/ibus_engine_factory_service_unittest.cc', 'dbus/ibus/ibus_engine_factory_service_unittest.cc',
'dbus/ibus/ibus_engine_service_unittest.cc',
'dbus/ibus/ibus_input_context_client_unittest.cc', 'dbus/ibus/ibus_input_context_client_unittest.cc',
'dbus/ibus/ibus_lookup_table_unittest.cc', 'dbus/ibus/ibus_lookup_table_unittest.cc',
'dbus/ibus/ibus_object_unittest.cc', 'dbus/ibus/ibus_object_unittest.cc',
......
...@@ -316,9 +316,7 @@ class DBusThreadManagerImpl : public DBusThreadManager { ...@@ -316,9 +316,7 @@ class DBusThreadManagerImpl : public DBusThreadManager {
const dbus::ObjectPath& object_path) OVERRIDE { const dbus::ObjectPath& object_path) OVERRIDE {
if (ibus_engine_services_.find(object_path) if (ibus_engine_services_.find(object_path)
== ibus_engine_services_.end()) { == ibus_engine_services_.end()) {
ibus_engine_services_[object_path] = ibus_engine_services_[object_path] = IBusEngineService::Create();
IBusEngineService::Create(STUB_DBUS_CLIENT_IMPLEMENTATION,
ibus_bus_.get(), object_path);
} }
return ibus_engine_services_[object_path]; return ibus_engine_services_[object_path];
} }
......
...@@ -53,57 +53,6 @@ const char kServiceInterface[] = "org.freedesktop.IBus.Factory"; ...@@ -53,57 +53,6 @@ const char kServiceInterface[] = "org.freedesktop.IBus.Factory";
const char kCreateEngineMethod[] = "CreateEngine"; const char kCreateEngineMethod[] = "CreateEngine";
} // namespace engine_factory } // namespace engine_factory
namespace engine {
const char kServicePathPrefix[] = "/org/freedesktop/IBus/Engine/";
const char kServiceInterface[] = "org.freedesktop.IBus.Engine";
const char kFocusInMethod[] = "FocusIn";
const char kFocusOutMethod[] = "FocusOut";
const char kEnableMethod[] = "Enable";
const char kDisableMethod[] = "Disable";
const char kPropertyActivateMethod[] = "PropertyActivate";
const char kPropertyShowMethod[] = "PropertyShow";
const char kPropertyHideMethod[] = "PropertyHide";
const char kSetCapabilityMethod[] = "SetCapability";
const char kResetMethod[] = "Reset";
const char kProcessKeyEventMethod[] = "ProcessKeyEvent";
const char kCandidateClickedMethod[] = "CandidateClicked";
const char kSetSurroundingTextMethod[] = "SetSurroundingText";
const char kRegisterPropertiesSignal[] = "RegisterProperties";
const char kUpdatePreeditSignal[] = "UpdatePreeditText";
const char kUpdateAuxiliaryTextSignal[] = "UpdateAuxiliaryText";
const char kUpdateLookupTableSignal[] = "UpdateLookupTable";
const char kUpdatePropertySignal[] = "UpdateProperty";
const char kForwardKeyEventSignal[] = "ForwardKeyEvent";
const char kRequireSurroundingTextSignal[] = "RequireSurroundingText";
const char kCommitTextSignal[] = "CommitText";
const char kDeleteSurroundingTextSignal[] = "DeleteSurroundingText";
} // namespace engine
namespace panel {
const char kServiceName[] = "org.freedesktop.IBus.Panel";
const char kServicePath[] = "/org/freedesktop/IBus/Panel";
const char kServiceInterface[] = "org.freedesktop.IBus.Panel";
const char kUpdateLookupTableMethod[] = "UpdateLookupTable";
const char kHideLookupTableMethod[] = "HideLookupTable";
const char kUpdateAuxiliaryTextMethod[] = "UpdateAuxiliaryText";
const char kHideAuxiliaryTextMethod[] = "HideAuxiliaryText";
const char kUpdatePreeditTextMethod[] = "UpdatePreeditText";
const char kHidePreeditTextMethod[] = "HidePreeditText";
const char kRegisterPropertiesMethod[] = "RegisterProperties";
const char kUpdatePropertyMethod[] = "UpdateProperty";
const char kCandidateClickedSignal[] = "CandidateClicked";
const char kCursorUpSignal[] = "CursorUp";
const char kCursorDownSignal[] = "CursorDown";
const char kPageUpSignal[] = "PageUp";
const char kPageDownSignal[] = "PageDown";
// Methods to be just ignored. We do not use these methods in the UI.
// See http://crbug.com/164525.
const char kFocusInMethod[] = "FocusIn";
const char kFocusOutMethod[] = "FocusOut";
const char kStateChangedMethod[] = "StateChanged";
} // namespace panel
namespace config { namespace config {
const char kServiceName[] = "org.freedesktop.IBus.Config"; const char kServiceName[] = "org.freedesktop.IBus.Config";
const char kServicePath[] = "/org/freedesktop/IBus/Config"; const char kServicePath[] = "/org/freedesktop/IBus/Config";
......
This diff is collapsed.
...@@ -13,11 +13,6 @@ ...@@ -13,11 +13,6 @@
#include "chromeos/dbus/dbus_client_implementation_type.h" #include "chromeos/dbus/dbus_client_implementation_type.h"
#include "chromeos/dbus/ibus/ibus_constants.h" #include "chromeos/dbus/ibus/ibus_constants.h"
namespace dbus {
class Bus;
class ObjectPath;
} // namespace dbus
namespace chromeos { namespace chromeos {
class IBusLookupTable; class IBusLookupTable;
...@@ -76,10 +71,7 @@ class CHROMEOS_EXPORT IBusEngineService { ...@@ -76,10 +71,7 @@ class CHROMEOS_EXPORT IBusEngineService {
// Factory function, creates a new instance and returns ownership. // Factory function, creates a new instance and returns ownership.
// For normal usage, access the singleton via DBusThreadManager::Get(). // For normal usage, access the singleton via DBusThreadManager::Get().
static CHROMEOS_EXPORT IBusEngineService* Create( static CHROMEOS_EXPORT IBusEngineService* Create();
DBusClientImplementationType type,
dbus::Bus* bus,
const dbus::ObjectPath& object_path);
protected: protected:
// Create() should be used instead. // Create() should be used instead.
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment