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 "chromeos/dbus/ibus/ibus_input_context_client.h" | 5 #include "chromeos/dbus/ibus/ibus_input_context_client.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "chromeos/dbus/ibus/ibus_constants.h" | 10 #include "chromeos/dbus/ibus/ibus_constants.h" |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
176 proxy_->CallMethodWithErrorCallback( | 176 proxy_->CallMethodWithErrorCallback( |
177 &method_call, | 177 &method_call, |
178 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 178 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
179 base::Bind(&IBusInputContextClientImpl::OnProcessKeyEvent, | 179 base::Bind(&IBusInputContextClientImpl::OnProcessKeyEvent, |
180 callback, | 180 callback, |
181 error_callback), | 181 error_callback), |
182 base::Bind(&IBusInputContextClientImpl::OnProecessKeyEventFail, | 182 base::Bind(&IBusInputContextClientImpl::OnProecessKeyEventFail, |
183 error_callback)); | 183 error_callback)); |
184 } | 184 } |
185 | 185 |
186 // IBusInputContextClient override. | |
187 void SetSurroundingText(const std::string& text, uint32 start_index, | |
188 uint32 end_index) OVERRIDE { | |
satorux1
2012/08/02 16:38:16
one parameter per one line.
Seigo Nonaka
2012/08/02 17:54:32
Done.
| |
189 dbus::MethodCall method_call(ibus::input_context::kServiceInterface, | |
190 ibus::input_context::kSetSurroundingText); | |
191 dbus::MessageWriter writer(&method_call); | |
192 ibus::AppendStringAsIBusText(text, &writer); | |
193 writer.AppendUint32(start_index); | |
194 writer.AppendUint32(end_index); | |
195 CallNoResponseMethod(&method_call, | |
196 ibus::input_context::kSetSurroundingText); | |
197 } | |
198 | |
186 private: | 199 private: |
187 void CallNoResponseMethod(dbus::MethodCall* method_call, | 200 void CallNoResponseMethod(dbus::MethodCall* method_call, |
188 const std::string& method_name) { | 201 const std::string& method_name) { |
189 proxy_->CallMethodWithErrorCallback( | 202 proxy_->CallMethodWithErrorCallback( |
190 method_call, | 203 method_call, |
191 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 204 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
192 base::Bind(&IBusInputContextClientImpl::DefaultCallback, | 205 base::Bind(&IBusInputContextClientImpl::DefaultCallback, |
193 method_name), | 206 method_name), |
194 base::Bind(&IBusInputContextClientImpl::DefaultErrorCallback, | 207 base::Bind(&IBusInputContextClientImpl::DefaultErrorCallback, |
195 method_name)); | 208 method_name)); |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
403 virtual void Reset() OVERRIDE {} | 416 virtual void Reset() OVERRIDE {} |
404 virtual void SetCursorLocation(int32 x, int32 y, int32 w, int32 h) OVERRIDE {} | 417 virtual void SetCursorLocation(int32 x, int32 y, int32 w, int32 h) OVERRIDE {} |
405 virtual void ProcessKeyEvent( | 418 virtual void ProcessKeyEvent( |
406 uint32 keyval, | 419 uint32 keyval, |
407 uint32 keycode, | 420 uint32 keycode, |
408 uint32 state, | 421 uint32 state, |
409 const ProcessKeyEventCallback& callback, | 422 const ProcessKeyEventCallback& callback, |
410 const ErrorCallback& error_callback) OVERRIDE { | 423 const ErrorCallback& error_callback) OVERRIDE { |
411 callback.Run(false); | 424 callback.Run(false); |
412 } | 425 } |
426 void SetSurroundingText(const std::string& text, uint32 start_index, | |
satorux1
2012/08/02 16:38:16
ditto
Seigo Nonaka
2012/08/02 17:54:32
Done.
| |
427 uint32 end_index) OVERRIDE {} | |
413 | 428 |
414 private: | 429 private: |
415 DISALLOW_COPY_AND_ASSIGN(IBusInputContextClientStubImpl); | 430 DISALLOW_COPY_AND_ASSIGN(IBusInputContextClientStubImpl); |
416 }; | 431 }; |
417 | 432 |
418 } // namespace | 433 } // namespace |
419 | 434 |
420 /////////////////////////////////////////////////////////////////////////////// | 435 /////////////////////////////////////////////////////////////////////////////// |
421 // IBusInputContextClient | 436 // IBusInputContextClient |
422 | 437 |
423 IBusInputContextClient::IBusInputContextClient() {} | 438 IBusInputContextClient::IBusInputContextClient() {} |
424 | 439 |
425 IBusInputContextClient::~IBusInputContextClient() {} | 440 IBusInputContextClient::~IBusInputContextClient() {} |
426 | 441 |
427 // static | 442 // static |
428 IBusInputContextClient* IBusInputContextClient::Create( | 443 IBusInputContextClient* IBusInputContextClient::Create( |
429 DBusClientImplementationType type) { | 444 DBusClientImplementationType type) { |
430 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) { | 445 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) { |
431 return new IBusInputContextClientImpl(); | 446 return new IBusInputContextClientImpl(); |
432 } | 447 } |
433 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); | 448 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); |
434 return new IBusInputContextClientStubImpl(); | 449 return new IBusInputContextClientStubImpl(); |
435 } | 450 } |
436 } // namespace chromeos | 451 } // namespace chromeos |
OLD | NEW |