| Index: ui/base/ime/input_method_win.h
|
| diff --git a/ui/base/ime/input_method_win.h b/ui/base/ime/input_method_win.h
|
| index b02d670c17aa99616f3f5ee58145a0117bd148a3..b6d53208378793966832283e60978d2286fb450c 100644
|
| --- a/ui/base/ime/input_method_win.h
|
| +++ b/ui/base/ime/input_method_win.h
|
| @@ -23,28 +23,28 @@ class UI_BASE_EXPORT InputMethodWin : public InputMethodBase {
|
| HWND toplevel_window_handle);
|
|
|
| // Overridden from InputMethod:
|
| - virtual void Init(bool focused) OVERRIDE;
|
| - virtual void OnFocus() OVERRIDE;
|
| - virtual void OnBlur() OVERRIDE;
|
| + virtual void Init(bool focused) 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:
|
| // Overridden from InputMethodBase:
|
| // If a derived class overrides this method, it should call parent's
|
| // implementation.
|
| virtual void OnWillChangeFocusedClient(TextInputClient* focused_before,
|
| - TextInputClient* focused) OVERRIDE;
|
| + TextInputClient* focused) override;
|
| virtual void OnDidChangeFocusedClient(TextInputClient* focused_before,
|
| - TextInputClient* focused) OVERRIDE;
|
| + TextInputClient* focused) override;
|
|
|
| private:
|
| // For both WM_CHAR and WM_SYSCHAR
|
|
|