| Index: ui/views/controls/prefix_selector.h
|
| diff --git a/ui/views/controls/prefix_selector.h b/ui/views/controls/prefix_selector.h
|
| index 8c40edaf2cd7be0cf167c88706ada2a4659cabd1..b1af2ad6de359a15d3eda5179f21ce515d82ba6d 100644
|
| --- a/ui/views/controls/prefix_selector.h
|
| +++ b/ui/views/controls/prefix_selector.h
|
| @@ -19,45 +19,44 @@ class PrefixDelegate;
|
| class VIEWS_EXPORT PrefixSelector : public ui::TextInputClient {
|
| public:
|
| explicit PrefixSelector(PrefixDelegate* delegate);
|
| - virtual ~PrefixSelector();
|
| + ~PrefixSelector() override;
|
|
|
| // Invoked from the view when it loses focus.
|
| void OnViewBlur();
|
|
|
| // ui::TextInputClient:
|
| - virtual void SetCompositionText(
|
| - const ui::CompositionText& composition) override;
|
| - virtual void ConfirmCompositionText() override;
|
| - virtual void ClearCompositionText() 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 int GetTextInputFlags() const override;
|
| - virtual bool CanComposeInline() const override;
|
| - virtual gfx::Rect GetCaretBounds() const override;
|
| - virtual bool GetCompositionCharacterBounds(uint32 index,
|
| - gfx::Rect* rect) const override;
|
| - virtual bool HasCompositionText() const override;
|
| - virtual bool GetTextRange(gfx::Range* range) const override;
|
| - virtual bool GetCompositionTextRange(gfx::Range* range) const override;
|
| - virtual bool GetSelectionRange(gfx::Range* range) const override;
|
| - virtual bool SetSelectionRange(const gfx::Range& range) override;
|
| - virtual bool DeleteRange(const gfx::Range& range) override;
|
| - virtual bool GetTextFromRange(const gfx::Range& range,
|
| - base::string16* text) const override;
|
| - virtual void OnInputMethodChanged() override;
|
| - virtual bool ChangeTextDirectionAndLayoutAlignment(
|
| + void SetCompositionText(const ui::CompositionText& composition) override;
|
| + void ConfirmCompositionText() override;
|
| + void ClearCompositionText() override;
|
| + void InsertText(const base::string16& text) override;
|
| + void InsertChar(base::char16 ch, int flags) override;
|
| + gfx::NativeWindow GetAttachedWindow() const override;
|
| + ui::TextInputType GetTextInputType() const override;
|
| + ui::TextInputMode GetTextInputMode() const override;
|
| + int GetTextInputFlags() const override;
|
| + bool CanComposeInline() const override;
|
| + gfx::Rect GetCaretBounds() const override;
|
| + bool GetCompositionCharacterBounds(uint32 index,
|
| + gfx::Rect* rect) const override;
|
| + bool HasCompositionText() const override;
|
| + bool GetTextRange(gfx::Range* range) const override;
|
| + bool GetCompositionTextRange(gfx::Range* range) const override;
|
| + bool GetSelectionRange(gfx::Range* range) const override;
|
| + bool SetSelectionRange(const gfx::Range& range) override;
|
| + bool DeleteRange(const gfx::Range& range) override;
|
| + bool GetTextFromRange(const gfx::Range& range,
|
| + base::string16* text) const override;
|
| + void OnInputMethodChanged() override;
|
| + bool ChangeTextDirectionAndLayoutAlignment(
|
| base::i18n::TextDirection direction) override;
|
| - virtual void ExtendSelectionAndDelete(size_t before, size_t after) override;
|
| - virtual void EnsureCaretInRect(const gfx::Rect& rect) override;
|
| - 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;
|
| + void ExtendSelectionAndDelete(size_t before, size_t after) override;
|
| + void EnsureCaretInRect(const gfx::Rect& rect) override;
|
| + void OnCandidateWindowShown() override;
|
| + void OnCandidateWindowUpdated() override;
|
| + void OnCandidateWindowHidden() override;
|
| +
|
| + bool IsEditingCommandEnabled(int command_id) override;
|
| + void ExecuteEditingCommand(int command_id) override;
|
|
|
| private:
|
| // Invoked when text is typed. Tries to change the selection appropriately.
|
|
|