summaryrefslogtreecommitdiffstats
path: root/chromium/ui/base/ime/dummy_text_input_client.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/base/ime/dummy_text_input_client.h')
-rw-r--r--chromium/ui/base/ime/dummy_text_input_client.h20
1 files changed, 13 insertions, 7 deletions
diff --git a/chromium/ui/base/ime/dummy_text_input_client.h b/chromium/ui/base/ime/dummy_text_input_client.h
index 1242bb990d0..be2295c3bb9 100644
--- a/chromium/ui/base/ime/dummy_text_input_client.h
+++ b/chromium/ui/base/ime/dummy_text_input_client.h
@@ -13,18 +13,18 @@ namespace ui {
class DummyTextInputClient : public TextInputClient {
public:
DummyTextInputClient();
+ explicit DummyTextInputClient(TextInputType text_input_type);
virtual ~DummyTextInputClient();
// Overriden from TextInputClient.
- virtual void SetCompositionText(
- const ui::CompositionText& composition) OVERRIDE;
+ virtual void SetCompositionText(const CompositionText& composition) OVERRIDE;
virtual void ConfirmCompositionText() OVERRIDE;
virtual void ClearCompositionText() OVERRIDE;
- virtual void InsertText(const string16& text) OVERRIDE;
- virtual void InsertChar(char16 ch, int flags) OVERRIDE;
+ virtual void InsertText(const base::string16& text) OVERRIDE;
+ virtual void InsertChar(base::char16 ch, int flags) OVERRIDE;
virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;
- virtual ui::TextInputType GetTextInputType() const OVERRIDE;
- virtual ui::TextInputMode GetTextInputMode() const OVERRIDE;
+ virtual TextInputType GetTextInputType() const OVERRIDE;
+ virtual TextInputMode GetTextInputMode() const OVERRIDE;
virtual bool CanComposeInline() const OVERRIDE;
virtual gfx::Rect GetCaretBounds() const OVERRIDE;
virtual bool GetCompositionCharacterBounds(uint32 index,
@@ -36,7 +36,7 @@ class DummyTextInputClient : public TextInputClient {
virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE;
virtual bool DeleteRange(const gfx::Range& range) OVERRIDE;
virtual bool GetTextFromRange(const gfx::Range& range,
- string16* text) const OVERRIDE;
+ base::string16* text) const OVERRIDE;
virtual void OnInputMethodChanged() OVERRIDE;
virtual bool ChangeTextDirectionAndLayoutAlignment(
base::i18n::TextDirection direction) OVERRIDE;
@@ -45,6 +45,12 @@ class DummyTextInputClient : public TextInputClient {
virtual void OnCandidateWindowShown() OVERRIDE;
virtual void OnCandidateWindowUpdated() OVERRIDE;
virtual void OnCandidateWindowHidden() OVERRIDE;
+ virtual bool IsEditingCommandEnabled(int command_id) OVERRIDE;
+ virtual void ExecuteEditingCommand(int command_id) OVERRIDE;
+
+ TextInputType text_input_type_;
+
+ DISALLOW_COPY_AND_ASSIGN(DummyTextInputClient);
};
} // namespace ui