Index: ui/base/ime/input_method_auraandroid.cc |
diff --git a/mandoline/ui/aura/input_method_mandoline.cc b/ui/base/ime/input_method_auraandroid.cc |
similarity index 59% |
copy from mandoline/ui/aura/input_method_mandoline.cc |
copy to ui/base/ime/input_method_auraandroid.cc |
index 5857466112d1f512612d6e9f6673fde83a6f42e8..809ed3802d1a64f8ff90858132cf630cd9010e71 100644 |
--- a/mandoline/ui/aura/input_method_mandoline.cc |
+++ b/ui/base/ime/input_method_auraandroid.cc |
@@ -2,33 +2,40 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "mandoline/ui/aura/input_method_mandoline.h" |
+#include "ui/base/ime/input_method_auraandroid.h" |
#include "ui/base/ime/text_input_client.h" |
#include "ui/events/event.h" |
-namespace mandoline { |
+// TODO(mfomitchev): This is a copy of InputMethodMandoline. |
+// We should unify InputMethodMandoline, InputMethodMinimal, and this class. |
+ |
+namespace ui { |
//////////////////////////////////////////////////////////////////////////////// |
-// InputMethodMandoline, public: |
+// InputMethodAuraAndroid, public: |
-InputMethodMandoline::InputMethodMandoline( |
+InputMethodAuraAndroid::InputMethodAuraAndroid( |
ui::internal::InputMethodDelegate* delegate) { |
+ LOG(ERROR) << "auraclank: InputMethodAuraAndroid ctor"; |
SetDelegate(delegate); |
+ //hack, find the place to focus the input method |
+ OnFocus(); |
} |
-InputMethodMandoline::~InputMethodMandoline() {} |
+InputMethodAuraAndroid::~InputMethodAuraAndroid() {} |
//////////////////////////////////////////////////////////////////////////////// |
-// InputMethodMandoline, ui::InputMethod implementation: |
+// InputMethodAuraAndroid, ui::InputMethod implementation: |
-bool InputMethodMandoline::OnUntranslatedIMEMessage( |
+bool InputMethodAuraAndroid::OnUntranslatedIMEMessage( |
const base::NativeEvent& event, |
NativeEventResult* result) { |
return false; |
} |
-void InputMethodMandoline::DispatchKeyEvent(ui::KeyEvent* event) { |
+void InputMethodAuraAndroid::DispatchKeyEvent(ui::KeyEvent* event) { |
+ LOG(ERROR) << "auraclank: InputMethodAuraAndroid::DispatchKeyEvent"; |
DCHECK(event->type() == ui::ET_KEY_PRESSED || |
event->type() == ui::ET_KEY_RELEASED); |
@@ -51,23 +58,23 @@ void InputMethodMandoline::DispatchKeyEvent(ui::KeyEvent* event) { |
ignore_result(DispatchKeyEventPostIME(event)); |
} |
-void InputMethodMandoline::OnCaretBoundsChanged( |
+void InputMethodAuraAndroid::OnCaretBoundsChanged( |
const ui::TextInputClient* client) { |
} |
-void InputMethodMandoline::CancelComposition( |
+void InputMethodAuraAndroid::CancelComposition( |
const ui::TextInputClient* client) { |
} |
-void InputMethodMandoline::OnInputLocaleChanged() { |
+void InputMethodAuraAndroid::OnInputLocaleChanged() { |
} |
-std::string InputMethodMandoline::GetInputLocale() { |
+std::string InputMethodAuraAndroid::GetInputLocale() { |
return ""; |
} |
-bool InputMethodMandoline::IsCandidatePopupOpen() const { |
+bool InputMethodAuraAndroid::IsCandidatePopupOpen() const { |
return false; |
} |
-} // namespace mandoline |
+} // namespace ui |