| Index: ui/views/ime/null_input_method.h
|
| diff --git a/ui/views/ime/null_input_method.h b/ui/views/ime/null_input_method.h
|
| index 49234d3d5510eb3faeffce548bfbe0e28cda8a22..29142e6d8bdca573a4cbdacb250537d432a20eb6 100644
|
| --- a/ui/views/ime/null_input_method.h
|
| +++ b/ui/views/ime/null_input_method.h
|
| @@ -22,24 +22,24 @@ class NullInputMethod : public InputMethod {
|
| NullInputMethod();
|
|
|
| // Overridden from InputMethod:
|
| - virtual void SetDelegate(internal::InputMethodDelegate* delegate) OVERRIDE;
|
| - virtual void Init(Widget* widget) OVERRIDE;
|
| - virtual void OnFocus() OVERRIDE;
|
| - virtual void OnBlur() OVERRIDE;
|
| + virtual void SetDelegate(internal::InputMethodDelegate* delegate) override;
|
| + virtual void Init(Widget* widget) override;
|
| + virtual void OnFocus() override;
|
| + virtual void OnBlur() override;
|
| virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
|
| - NativeEventResult* result) OVERRIDE;
|
| - virtual void DispatchKeyEvent(const ui::KeyEvent& key) OVERRIDE;
|
| - virtual void OnTextInputTypeChanged(View* view) OVERRIDE;
|
| - virtual void OnCaretBoundsChanged(View* view) OVERRIDE;
|
| - virtual void CancelComposition(View* view) OVERRIDE;
|
| - virtual void OnInputLocaleChanged() OVERRIDE;
|
| - virtual std::string GetInputLocale() OVERRIDE;
|
| - virtual bool IsActive() OVERRIDE;
|
| - virtual ui::TextInputClient* GetTextInputClient() const OVERRIDE;
|
| - virtual ui::TextInputType GetTextInputType() const OVERRIDE;
|
| - virtual bool IsCandidatePopupOpen() const OVERRIDE;
|
| - virtual void ShowImeIfNeeded() OVERRIDE;
|
| - virtual bool IsMock() const OVERRIDE;
|
| + NativeEventResult* result) override;
|
| + virtual void DispatchKeyEvent(const ui::KeyEvent& key) override;
|
| + virtual void OnTextInputTypeChanged(View* view) override;
|
| + virtual void OnCaretBoundsChanged(View* view) override;
|
| + virtual void CancelComposition(View* view) override;
|
| + virtual void OnInputLocaleChanged() override;
|
| + virtual std::string GetInputLocale() override;
|
| + virtual bool IsActive() override;
|
| + virtual ui::TextInputClient* GetTextInputClient() const override;
|
| + virtual ui::TextInputType GetTextInputType() const override;
|
| + virtual bool IsCandidatePopupOpen() const override;
|
| + virtual void ShowImeIfNeeded() override;
|
| + virtual bool IsMock() const override;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(NullInputMethod);
|
|
|