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

Unified Diff: mandoline/ui/aura/input_method_mandoline.h

Issue 1286383003: Mandoline: Enable Android software keyboard for the Omnibox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: mandoline/ui/aura/input_method_mandoline.h
diff --git a/mandoline/ui/aura/input_method_mandoline.h b/mandoline/ui/aura/input_method_mandoline.h
index 9da4653d5de1cf53db513fbadb26ca801b93dd68..77cc7ea2167006f54af688ebbceeea9d3d15752d 100644
--- a/mandoline/ui/aura/input_method_mandoline.h
+++ b/mandoline/ui/aura/input_method_mandoline.h
@@ -7,24 +7,43 @@
#ifndef MANDOLINE_UI_AURA_INPUT_METHOD_MANDOLINE_H_
#define MANDOLINE_UI_AURA_INPUT_METHOD_MANDOLINE_H_
+namespace mojo {
+class View;
+};
sky 2015/08/14 19:59:23 no ;
Peng 2015/08/17 13:26:49 Done.
+
namespace mandoline {
class InputMethodMandoline : public ui::InputMethodBase {
public:
- explicit InputMethodMandoline(ui::internal::InputMethodDelegate* delegate);
+ InputMethodMandoline(ui::internal::InputMethodDelegate* delegate,
+ mojo::View* view);
~InputMethodMandoline() override;
private:
// Overridden from ui::InputMethod:
+ void OnFocus() override;
+ void OnBlur() override;
bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
NativeEventResult* result) override;
void DispatchKeyEvent(ui::KeyEvent* event) override;
+ void OnTextInputTypeChanged(const ui::TextInputClient* client) override;
void OnCaretBoundsChanged(const ui::TextInputClient* client) override;
void CancelComposition(const ui::TextInputClient* client) override;
void OnInputLocaleChanged() override;
std::string GetInputLocale() override;
bool IsCandidatePopupOpen() const override;
+ // Overridden from ui::InputMethodBase:
+ void OnWillChangeFocusedClient(ui::TextInputClient* focused_before,
+ ui::TextInputClient* focused) override;
+ void OnDidChangeFocusedClient(ui::TextInputClient* focused_before,
+ ui::TextInputClient* focused) override;
+
+ void UpdateTextInputType();
+
+ // The toplevel view which is not owned by this class.
+ mojo::View* view_;
+
DISALLOW_COPY_AND_ASSIGN(InputMethodMandoline);
};

Powered by Google App Engine
This is Rietveld 408576698