Index: ui/views/controls/prefix_selector.h |
diff --git a/ui/views/controls/prefix_selector.h b/ui/views/controls/prefix_selector.h |
index 255046f60dff9aed12021c2286c9de0395e59f82..615f239f46406bc8a28b1b19239a22415153b65c 100644 |
--- a/ui/views/controls/prefix_selector.h |
+++ b/ui/views/controls/prefix_selector.h |
@@ -26,37 +26,37 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInputClient { |
// 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 bool CanComposeInline() const OVERRIDE; |
- virtual gfx::Rect GetCaretBounds() const OVERRIDE; |
+ 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 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; |
+ 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; |
+ base::string16* text) const override; |
+ virtual void OnInputMethodChanged() override; |
virtual 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; |
+ 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; |
private: |
// Invoked when text is typed. Tries to change the selection appropriately. |