| Index: ui/base/ime/input_method_chromeos.h
|
| diff --git a/ui/base/ime/input_method_chromeos.h b/ui/base/ime/input_method_chromeos.h
|
| index 98b42aed445fbb17dbc5ff8f31f5b388649fcdc0..a09cd3d794ace667751f8412058649daa11d24ca 100644
|
| --- a/ui/base/ime/input_method_chromeos.h
|
| +++ b/ui/base/ime/input_method_chromeos.h
|
| @@ -28,18 +28,18 @@ class UI_BASE_EXPORT InputMethodChromeOS
|
| virtual ~InputMethodChromeOS();
|
|
|
| // Overridden from InputMethod:
|
| - virtual void OnFocus() OVERRIDE;
|
| - virtual void OnBlur() OVERRIDE;
|
| + virtual void OnFocus() override;
|
| + virtual void OnBlur() override;
|
| virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
|
| - NativeEventResult* result) OVERRIDE;
|
| - virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE;
|
| - virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE;
|
| - virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE;
|
| - virtual void CancelComposition(const TextInputClient* client) OVERRIDE;
|
| - virtual void OnInputLocaleChanged() OVERRIDE;
|
| - virtual std::string GetInputLocale() OVERRIDE;
|
| - virtual bool IsActive() OVERRIDE;
|
| - virtual bool IsCandidatePopupOpen() const OVERRIDE;
|
| + NativeEventResult* result) override;
|
| + virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override;
|
| + virtual void OnTextInputTypeChanged(const TextInputClient* client) override;
|
| + virtual void OnCaretBoundsChanged(const TextInputClient* client) override;
|
| + virtual void CancelComposition(const TextInputClient* client) override;
|
| + virtual void OnInputLocaleChanged() override;
|
| + virtual std::string GetInputLocale() override;
|
| + virtual bool IsActive() override;
|
| + virtual bool IsCandidatePopupOpen() const override;
|
|
|
| protected:
|
| // Converts |text| into CompositionText.
|
| @@ -59,9 +59,9 @@ class UI_BASE_EXPORT InputMethodChromeOS
|
|
|
| // Overridden from InputMethodBase:
|
| virtual void OnWillChangeFocusedClient(TextInputClient* focused_before,
|
| - TextInputClient* focused) OVERRIDE;
|
| + TextInputClient* focused) override;
|
| virtual void OnDidChangeFocusedClient(TextInputClient* focused_before,
|
| - TextInputClient* focused) OVERRIDE;
|
| + TextInputClient* focused) override;
|
|
|
| // Asks the client to confirm current composition text.
|
| void ConfirmCompositionText();
|
| @@ -100,11 +100,11 @@ class UI_BASE_EXPORT InputMethodChromeOS
|
| bool ExecuteCharacterComposer(const ui::KeyEvent& event);
|
|
|
| // chromeos::IMEInputContextHandlerInterface overrides:
|
| - virtual void CommitText(const std::string& text) OVERRIDE;
|
| + virtual void CommitText(const std::string& text) override;
|
| virtual void UpdateCompositionText(const chromeos::CompositionText& text,
|
| uint32 cursor_pos,
|
| - bool visible) OVERRIDE;
|
| - virtual void DeleteSurroundingText(int32 offset, uint32 length) OVERRIDE;
|
| + bool visible) override;
|
| + virtual void DeleteSurroundingText(int32 offset, uint32 length) override;
|
|
|
| // Hides the composition text.
|
| void HidePreeditText();
|
|
|