Index: chrome/browser/extensions/extension_input_api.cc |
diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc |
index ffcd6594505e0498fe6807c978e2c119f986944b..156a6dcefff1c0cf88c5b305d6df75b0aa2a5576 100644 |
--- a/chrome/browser/extensions/extension_input_api.cc |
+++ b/chrome/browser/extensions/extension_input_api.cc |
@@ -16,6 +16,11 @@ |
#include "views/ime/input_method.h" |
#include "views/widget/widget.h" |
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI) |
+#include "chrome/browser/chromeos/cros/cros_library.h" |
+#include "chrome/browser/chromeos/cros/input_method_library.h" |
+#endif |
+ |
namespace { |
// Keys. |
@@ -35,6 +40,9 @@ const char kUnknownOrUnsupportedKeyIdentiferError[] = "Unknown or unsupported " |
const char kUnsupportedModifier[] = "Unsupported modifier."; |
const char kNoValidRecipientError[] = "No valid recipient for event."; |
const char kKeyEventUnprocessedError[] = "Event was not handled."; |
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI) |
+const char kCrosLibraryNotLoadedError[] = "Cros shared library not loaded."; |
+#endif |
ui::EventType GetTypeFromString(const std::string& type) { |
if (type == kKeyDown) { |
@@ -116,3 +124,44 @@ bool SendKeyboardEventInputFunction::RunImpl() { |
return true; |
} |
+ |
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI) |
+bool SendHandwritingStrokeFunction::RunImpl() { |
+ // TODO(yusukes): Add a parameter for an input context ID. |
+ ListValue* value = NULL; |
+ EXTENSION_FUNCTION_VALIDATE(args_->GetList(0, &value)); |
+ |
+ chromeos::HandwritingStroke stroke; |
+ for (size_t i = 0; i < value->GetSize(); ++i) { |
+ DictionaryValue* dict; |
+ double x = 0.0; |
+ double y = 0.0; |
+ EXTENSION_FUNCTION_VALIDATE(value->GetDictionary(i, &dict)); |
+ EXTENSION_FUNCTION_VALIDATE(dict->GetDouble("x", &x)); |
+ EXTENSION_FUNCTION_VALIDATE(dict->GetDouble("y", &y)); |
+ stroke.push_back(std::make_pair(x, y)); |
+ } |
+ chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get(); |
Mihai Parparita -not on Chrome
2011/05/05 22:47:49
Shouldn't this be at the start of the function?
Yusuke Sato
2011/05/16 15:47:38
Done.
|
+ if (!cros_library->EnsureLoaded()) { |
+ error_ = kCrosLibraryNotLoadedError; |
+ return false; |
+ } |
+ cros_library->GetInputMethodLibrary()->SendHandwritingStroke(stroke); |
+ return true; |
+} |
+ |
+bool CancelHandwritingFunction::RunImpl() { |
+ // TODO(yusukes): Add a parameter for an input context ID. |
+ int n_strokes = 0; // zero means 'clear all strokes'. |
+ if (HasOptionalArgument(0)) { |
+ EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &n_strokes)); |
+ } |
+ chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get(); |
Mihai Parparita -not on Chrome
2011/05/05 22:47:49
Ditto.
Yusuke Sato
2011/05/16 15:47:38
Done.
|
+ if (!cros_library->EnsureLoaded()) { |
+ error_ = kCrosLibraryNotLoadedError; |
+ return false; |
+ } |
+ cros_library->GetInputMethodLibrary()->CancelHandwriting(n_strokes); |
Erik does not do reviews
2011/05/06 00:51:03
is passing a negative number (or a large number) b
Yusuke Sato
2011/05/16 15:47:38
Done.
|
+ return true; |
+} |
+#endif |