summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authornona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 11:24:59 +0000
committernona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 11:24:59 +0000
commitc0c776e13a4b8df71d3d8fbb26e5839c8bc2d63f (patch)
tree6c3b3865965005690d7aa06452e42b247528a812 /chromeos
parent3aa7ffc2a249fac3d50f717a92f35d97151d2953 (diff)
downloadchromium_src-c0c776e13a4b8df71d3d8fbb26e5839c8bc2d63f.zip
chromium_src-c0c776e13a4b8df71d3d8fbb26e5839c8bc2d63f.tar.gz
chromium_src-c0c776e13a4b8df71d3d8fbb26e5839c8bc2d63f.tar.bz2
Revert 179842
> Introduce IBusBridge for ibus-less implementation. > > IBusBridge provides access of each ibus event handler. > > BUG=170671 > TEST=None > > > Review URL: https://chromiumcodereview.appspot.com/11956041 TBR=nona@chromium.org Review URL: https://codereview.chromium.org/12095082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/chromeos.gyp2
-rw-r--r--chromeos/ime/ibus_bridge.cc24
-rw-r--r--chromeos/ime/ibus_bridge.h97
3 files changed, 0 insertions, 123 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 54d8245..aff5f13 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -125,8 +125,6 @@
'display/output_configurator.h',
'ime/ibus_daemon_controller.cc',
'ime/ibus_daemon_controller.h',
- 'ime/ibus_bridge.h',
- 'ime/ibus_bridge.cc',
'network/cros_network_functions.cc',
'network/cros_network_functions.h',
'network/device_state.cc',
diff --git a/chromeos/ime/ibus_bridge.cc b/chromeos/ime/ibus_bridge.cc
deleted file mode 100644
index 9f9f3b8..0000000
--- a/chromeos/ime/ibus_bridge.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chromeos/ime/ibus_bridge.h"
-
-#include "base/logging.h"
-#include "base/memory/singleton.h"
-
-namespace chromeos {
-
-IBusBridge::IBusBridge()
- : input_context_handler_(NULL),
- engine_handler_(NULL),
- candidate_window_handler_(NULL),
- panel_handler_(NULL) {
-}
-
-// static
-IBusBridge* IBusBridge::GetInstance() {
- return Singleton<IBusBridge>::get();
-}
-
-} // namespace chromeos
diff --git a/chromeos/ime/ibus_bridge.h b/chromeos/ime/ibus_bridge.h
deleted file mode 100644
index 0ee74c2..0000000
--- a/chromeos/ime/ibus_bridge.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROMEOS_IME_IBUS_BRIDGE_H_
-#define CHROMEOS_IME_IBUS_BRIDGE_H_
-
-#include <string>
-#include "base/basictypes.h"
-#include "base/memory/singleton.h"
-
-namespace chromeos {
-class IBusInputContextHandlerInterface;
-class IBusEngineHandlerInterface;
-
-namespace ibus {
-class IBusPanelCandidateWindowHandlerInterface;
-class IBusPanelPropertyHandlerInterface;
-} // namespace ibus
-
-// IBusBridge provides access of each IME related handler. This class is used
-// for IME implementation without ibus-daemon. The legacy ibus IME communicates
-// their engine with dbus protocol, but new implementation doesn't. Instead of
-// dbus communcation, new implementation calls target service(e.g. PanelService
-// or EngineService) directly by using this class. IBusBridge is managed as
-// singleton object.
-class IBusBridge {
- public:
- // Returns IBusBridge instance.
- static IBusBridge* GetInstance();
-
- // Returns current InputContextHandler. This function returns NULL if input
- // context is not ready to use.
- IBusInputContextHandlerInterface* input_context_handler() const {
- return input_context_handler_;
- }
-
- // Updates current InputContextHandler. If there is no active input context,
- // pass NULL for |handler|. Caller must release |handler|.
- void set_input_context_handler(IBusInputContextHandlerInterface* handler) {
- input_context_handler_ = handler;
- }
-
- // Returns current EngineHandler. This function returns NULL if current engine
- // is not ready to use.
- IBusEngineHandlerInterface* engine_handler() const {
- return engine_handler_;
- }
-
- // Updates current EngineHandler. If there is no active engine service, pass
- // NULL for |handler|. Caller must release |handler|.
- void set_engine_handler(IBusEngineHandlerInterface* handler) {
- engine_handler_ = handler;
- }
-
- // Returns current CandidateWindowHandler. This function returns NULL if
- // current candidate window is not ready to use.
- ibus::IBusPanelCandidateWindowHandlerInterface*
- candidate_window_handler() const {
- return candidate_window_handler_;
- }
-
- // Updates current CandidatWindowHandler. If there is no active candidate
- // window service, pass NULL for |handler|. Caller must release |handler|.
- void set_candidate_window_handler(
- ibus::IBusPanelCandidateWindowHandlerInterface* handler) {
- candidate_window_handler_ = handler;
- }
-
- // Returns current PropertyHandler. This function returns NULL if panel window
- // is not ready to use.
- ibus::IBusPanelPropertyHandlerInterface* panel_handler() const {
- return panel_handler_;
- }
-
- // Updates current PropertyHandler. If there is no active property service,
- // pass NULL for |handler|. Caller must release |handler|.
- void set_panel_handler(ibus::IBusPanelPropertyHandlerInterface* handler) {
- panel_handler_ = handler;
- }
-
- private:
- // Singleton implementation. Use GetInstance for getting instance.
- IBusBridge();
- friend struct DefaultSingletonTraits<IBusBridge>;
-
- IBusInputContextHandlerInterface* input_context_handler_;
- IBusEngineHandlerInterface* engine_handler_;
- ibus::IBusPanelCandidateWindowHandlerInterface* candidate_window_handler_;
- ibus::IBusPanelPropertyHandlerInterface* panel_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(IBusBridge);
-};
-
-} // namespace chromeos
-
-#endif // CHROMEOS_IME_IBUS_BRIDGE_H_