diff options
author | azurewei <azurewei@chromium.org> | 2015-11-05 21:41:25 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-06 05:42:11 +0000 |
commit | c593c13abc9e9280bc07c7cfce666b3763ac5842 (patch) | |
tree | beed3e15a45669dc83e3002c3316a370910457dc /ui/base/ime/input_method_chromeos.h | |
parent | 176b5f713052535874dec1290ac8fad0ba2b74d5 (diff) | |
download | chromium_src-c593c13abc9e9280bc07c7cfce666b3763ac5842.zip chromium_src-c593c13abc9e9280bc07c7cfce666b3763ac5842.tar.gz chromium_src-c593c13abc9e9280bc07c7cfce666b3763ac5842.tar.bz2 |
Merge duplicated CompositionText structures
Delete the duplicated class chromeos::CompositionText, using struct ui::CompositionText instead.
BUG=525893
TEST=No compiling erros.
Review URL: https://codereview.chromium.org/1427573006
Cr-Commit-Position: refs/heads/master@{#358267}
Diffstat (limited to 'ui/base/ime/input_method_chromeos.h')
-rw-r--r-- | ui/base/ime/input_method_chromeos.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/ime/input_method_chromeos.h b/ui/base/ime/input_method_chromeos.h index fa84579..13cbdf9 100644 --- a/ui/base/ime/input_method_chromeos.h +++ b/ui/base/ime/input_method_chromeos.h @@ -42,7 +42,7 @@ class UI_BASE_IME_EXPORT InputMethodChromeOS protected: // Converts |text| into CompositionText. - void ExtractCompositionText(const chromeos::CompositionText& text, + void ExtractCompositionText(const CompositionText& text, uint32 cursor_position, CompositionText* out_composition) const; @@ -99,7 +99,7 @@ class UI_BASE_IME_EXPORT InputMethodChromeOS // ui::IMEInputContextHandlerInterface overrides: void CommitText(const std::string& text) override; - void UpdateCompositionText(const chromeos::CompositionText& text, + void UpdateCompositionText(const CompositionText& text, uint32 cursor_pos, bool visible) override; void DeleteSurroundingText(int32 offset, uint32 length) override; |