diff options
-rw-r--r-- | chrome/browser/chromeos/cros/input_method_library.cc | 15 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/input_method_library.h | 7 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/mock_input_method_library.h | 2 | ||||
-rw-r--r-- | tools/cros.DEPS/DEPS | 2 |
4 files changed, 25 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/cros/input_method_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc index d8519d2..89072ef 100644 --- a/chrome/browser/chromeos/cros/input_method_library.cc +++ b/chrome/browser/chromeos/cros/input_method_library.cc @@ -262,6 +262,18 @@ class InputMethodLibraryImpl : public InputMethodLibrary, return chromeos::GetKeyboardOverlayId(input_method_id); } + virtual void SendHandwritingStroke(const HandwritingStroke& stroke) { + if (!initialized_successfully_) + return; + chromeos::SendHandwritingStroke(input_method_status_connection_, stroke); + } + + virtual void CancelHandwriting(int n_strokes) { + if (!initialized_successfully_) + return; + chromeos::CancelHandwriting(input_method_status_connection_, n_strokes); + } + private: // Returns true if the given input method config value is a single // element string list that contains an input method ID of a keyboard @@ -895,6 +907,9 @@ class InputMethodLibraryStubImpl : public InputMethodLibrary { iter->second : ""; } + virtual void SendHandwritingStroke(const HandwritingStroke& stroke) {} + virtual void CancelHandwriting(int n_strokes) {} + private: typedef std::map<std::string, std::string> KeyboardOverlayMap; diff --git a/chrome/browser/chromeos/cros/input_method_library.h b/chrome/browser/chromeos/cros/input_method_library.h index e42cbbdc..3f44e6a 100644 --- a/chrome/browser/chromeos/cros/input_method_library.h +++ b/chrome/browser/chromeos/cros/input_method_library.h @@ -121,6 +121,13 @@ class InputMethodLibrary { // engines are removed. virtual void SetEnableAutoImeShutdown(bool enable) = 0; + // Sends a handwriting stroke to libcros. See chromeos::SendHandwritingStroke + // for details. + virtual void SendHandwritingStroke(const HandwritingStroke& stroke) = 0; + + // Clears last N handwriting strokes in libcros. See + // chromeos::CancelHandwriting for details. + virtual void CancelHandwriting(int n_strokes) = 0; virtual const InputMethodDescriptor& previous_input_method() const = 0; virtual const InputMethodDescriptor& current_input_method() const = 0; diff --git a/chrome/browser/chromeos/cros/mock_input_method_library.h b/chrome/browser/chromeos/cros/mock_input_method_library.h index 9b71c20..76743ba 100644 --- a/chrome/browser/chromeos/cros/mock_input_method_library.h +++ b/chrome/browser/chromeos/cros/mock_input_method_library.h @@ -37,6 +37,8 @@ class MockInputMethodLibrary : public InputMethodLibrary { MOCK_METHOD0(StopInputMethodDaemon, void(void)); MOCK_METHOD1(SetDeferImeStartup, void(bool)); MOCK_METHOD1(SetEnableAutoImeShutdown, void(bool)); + MOCK_METHOD1(SendHandwritingStroke, void(const HandwritingStroke&)); + MOCK_METHOD1(CancelHandwriting, void(int)); }; } // namespace chromeos diff --git a/tools/cros.DEPS/DEPS b/tools/cros.DEPS/DEPS index be6d6a2..9f1db15 100644 --- a/tools/cros.DEPS/DEPS +++ b/tools/cros.DEPS/DEPS @@ -4,5 +4,5 @@ vars = { deps = { "src/third_party/cros": - Var("chromium_git") + "/cros.git@ad013393", + Var("chromium_git") + "/cros.git@64ecf8b1", } |