Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: chromeos/dbus/ibus/ibus_client.cc

Issue 67313006: Delete IBusClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete test. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/ibus/ibus_client.h ('k') | chromeos/dbus/ibus/mock_ibus_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/ibus/ibus_client.cc
diff --git a/chromeos/dbus/ibus/ibus_client.cc b/chromeos/dbus/ibus/ibus_client.cc
deleted file mode 100644
index 80112a80d8e591761b40bda69f0ed2e1f2cd1783..0000000000000000000000000000000000000000
--- a/chromeos/dbus/ibus/ibus_client.cc
+++ /dev/null
@@ -1,92 +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/dbus/ibus/ibus_client.h"
-
-#include "base/bind.h"
-#include "base/callback.h"
-#include "chromeos/dbus/ibus/ibus_constants.h"
-#include "chromeos/dbus/ibus/ibus_component.h"
-#include "chromeos/dbus/ibus/ibus_engine_service.h"
-#include "chromeos/ime/ibus_bridge.h"
-#include "dbus/bus.h"
-#include "dbus/message.h"
-#include "dbus/object_path.h"
-#include "dbus/object_proxy.h"
-
-namespace chromeos {
-
-namespace {
-
-// An implementation of IBusClient without ibus-daemon interaction.
-// Currently this class is used only on linux desktop.
-// TODO(nona): Use this on ChromeOS device once crbug.com/171351 is fixed.
-class IBusClientDaemonlessImpl : public IBusClient {
- public:
- IBusClientDaemonlessImpl() {}
- virtual ~IBusClientDaemonlessImpl() {}
-
- virtual void CreateInputContext(
- const std::string& client_name,
- const CreateInputContextCallback & callback,
- const ErrorCallback& error_callback) OVERRIDE {
- // TODO(nona): Remove this function once ibus-daemon is gone.
- // We don't have to do anything for this function except for calling
- // |callback| as the success of this function. The original spec of ibus
- // supports multiple input contexts, but there is only one input context in
- // Chrome OS. That is all IME events will be came from same input context
- // and all engine action shuold be forwarded to same input context.
- dbus::ObjectPath path("dummpy path");
- callback.Run(path);
- }
-
- virtual void RegisterComponent(
- const IBusComponent& ibus_component,
- const RegisterComponentCallback& callback,
- const ErrorCallback& error_callback) OVERRIDE {
- // TODO(nona): Remove this function once ibus-daemon is gone.
- // The information about engine is stored in chromeos::InputMethodManager so
- // IBusBridge doesn't do anything except for calling |callback| as success
- // of this function.
- callback.Run();
- }
-
- virtual void SetGlobalEngine(const std::string& engine_name,
- const ErrorCallback& error_callback) OVERRIDE {
- IBusEngineHandlerInterface* previous_engine =
- IBusBridge::Get()->GetEngineHandler();
- if (previous_engine)
- previous_engine->Disable();
- IBusBridge::Get()->CreateEngine(engine_name);
- IBusEngineHandlerInterface* next_engine =
- IBusBridge::Get()->GetEngineHandler();
- IBusBridge::Get()->SetEngineHandler(next_engine);
- if (next_engine)
- next_engine->Enable();
- }
-
- virtual void Exit(ExitOption option,
- const ErrorCallback& error_callback) OVERRIDE {
- // Exit is not supported on daemon-less implementation.
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(IBusClientDaemonlessImpl);
-};
-
-} // namespace
-
-///////////////////////////////////////////////////////////////////////////////
-// IBusClient
-
-IBusClient::IBusClient() {}
-
-IBusClient::~IBusClient() {}
-
-// static
-IBusClient* IBusClient::Create() {
- return new IBusClientDaemonlessImpl();
-}
-
-} // namespace chromeos
« no previous file with comments | « chromeos/dbus/ibus/ibus_client.h ('k') | chromeos/dbus/ibus/mock_ibus_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698