summaryrefslogtreecommitdiffstats
path: root/ui/base/ime/input_method_chromeos.h
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-09 03:54:27 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-09 10:55:07 +0000
commit3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6 (patch)
tree720b6c8d126123e087abffedaedd8a9fa4907132 /ui/base/ime/input_method_chromeos.h
parent002d02909368b7067cc3df9149c5e46ce445861c (diff)
downloadchromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.zip
chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.tar.gz
chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.tar.bz2
replace OVERRIDE and FINAL with override and final in ui/
BUG=417463 Review URL: https://codereview.chromium.org/623293004 Cr-Commit-Position: refs/heads/master@{#298839}
Diffstat (limited to 'ui/base/ime/input_method_chromeos.h')
-rw-r--r--ui/base/ime/input_method_chromeos.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/ui/base/ime/input_method_chromeos.h b/ui/base/ime/input_method_chromeos.h
index 98b42ae..a09cd3d 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();