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

Side by Side Diff: chromeos/dbus/ibus/ibus_client.cc

Issue 11783053: Clean Up: Remove ibus namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/dbus/ibus/ibus_client.h ('k') | chromeos/dbus/ibus/ibus_component.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chromeos/dbus/ibus/ibus_client.h" 5 #include "chromeos/dbus/ibus/ibus_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "chromeos/dbus/ibus/ibus_constants.h" 9 #include "chromeos/dbus/ibus/ibus_constants.h"
10 #include "chromeos/dbus/ibus/ibus_component.h" 10 #include "chromeos/dbus/ibus/ibus_component.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 weak_ptr_factory_.GetWeakPtr(), 46 weak_ptr_factory_.GetWeakPtr(),
47 callback, 47 callback,
48 error_callback), 48 error_callback),
49 base::Bind(&IBusClientImpl::OnDBusMethodCallFail, 49 base::Bind(&IBusClientImpl::OnDBusMethodCallFail,
50 weak_ptr_factory_.GetWeakPtr(), 50 weak_ptr_factory_.GetWeakPtr(),
51 error_callback)); 51 error_callback));
52 } 52 }
53 53
54 // IBusClient override. 54 // IBusClient override.
55 virtual void RegisterComponent( 55 virtual void RegisterComponent(
56 const ibus::IBusComponent& ibus_component, 56 const IBusComponent& ibus_component,
57 const RegisterComponentCallback& callback, 57 const RegisterComponentCallback& callback,
58 const ErrorCallback& error_callback) OVERRIDE { 58 const ErrorCallback& error_callback) OVERRIDE {
59 DCHECK(!callback.is_null()); 59 DCHECK(!callback.is_null());
60 DCHECK(!error_callback.is_null()); 60 DCHECK(!error_callback.is_null());
61 dbus::MethodCall method_call(ibus::bus::kServiceInterface, 61 dbus::MethodCall method_call(ibus::bus::kServiceInterface,
62 ibus::bus::kRegisterComponentMethod); 62 ibus::bus::kRegisterComponentMethod);
63 dbus::MessageWriter writer(&method_call); 63 dbus::MessageWriter writer(&method_call);
64 ibus::AppendIBusComponent(ibus_component, &writer); 64 AppendIBusComponent(ibus_component, &writer);
65 proxy_->CallMethodWithErrorCallback( 65 proxy_->CallMethodWithErrorCallback(
66 &method_call, 66 &method_call,
67 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, 67 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
68 base::Bind(&IBusClientImpl::OnRegisterComponent, 68 base::Bind(&IBusClientImpl::OnRegisterComponent,
69 weak_ptr_factory_.GetWeakPtr(), 69 weak_ptr_factory_.GetWeakPtr(),
70 callback, 70 callback,
71 error_callback), 71 error_callback),
72 base::Bind(&IBusClientImpl::OnDBusMethodCallFail, 72 base::Bind(&IBusClientImpl::OnDBusMethodCallFail,
73 weak_ptr_factory_.GetWeakPtr(), 73 weak_ptr_factory_.GetWeakPtr(),
74 error_callback)); 74 error_callback));
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 virtual ~IBusClientDaemonlessImpl() {} 186 virtual ~IBusClientDaemonlessImpl() {}
187 187
188 virtual void CreateInputContext( 188 virtual void CreateInputContext(
189 const std::string& client_name, 189 const std::string& client_name,
190 const CreateInputContextCallback & callback, 190 const CreateInputContextCallback & callback,
191 const ErrorCallback& error_callback) OVERRIDE { 191 const ErrorCallback& error_callback) OVERRIDE {
192 // TODO(nona): Implement this. 192 // TODO(nona): Implement this.
193 } 193 }
194 194
195 virtual void RegisterComponent( 195 virtual void RegisterComponent(
196 const ibus::IBusComponent& ibus_component, 196 const IBusComponent& ibus_component,
197 const RegisterComponentCallback& callback, 197 const RegisterComponentCallback& callback,
198 const ErrorCallback& error_callback) OVERRIDE { 198 const ErrorCallback& error_callback) OVERRIDE {
199 // TODO(nona): Implement this. 199 // TODO(nona): Implement this.
200 } 200 }
201 201
202 virtual void SetGlobalEngine(const std::string& engine_name, 202 virtual void SetGlobalEngine(const std::string& engine_name,
203 const ErrorCallback& error_callback) OVERRIDE { 203 const ErrorCallback& error_callback) OVERRIDE {
204 // TODO(nona): Implement his. 204 // TODO(nona): Implement his.
205 } 205 }
206 206
(...skipping 19 matching lines...) Expand all
226 IBusClient* IBusClient::Create(DBusClientImplementationType type, 226 IBusClient* IBusClient::Create(DBusClientImplementationType type,
227 dbus::Bus* bus) { 227 dbus::Bus* bus) {
228 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) { 228 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
229 return new IBusClientImpl(bus); 229 return new IBusClientImpl(bus);
230 } 230 }
231 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); 231 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
232 return new IBusClientDaemonlessImpl(); 232 return new IBusClientDaemonlessImpl();
233 } 233 }
234 234
235 } // namespace chromeos 235 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/ibus/ibus_client.h ('k') | chromeos/dbus/ibus/ibus_component.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698