summaryrefslogtreecommitdiffstats
path: root/ui/base/ime/input_method_chromeos.h
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-01-15 15:11:21 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-15 23:12:15 +0000
commiteb25a619587ab419e2a4f5d3486b8bb2d8e8a5ff (patch)
tree8baaba34d093e97f725c76f898f67c212ce8c9ec /ui/base/ime/input_method_chromeos.h
parent67c6eac492d4b26809bfc097e5fc303af74e2c02 (diff)
downloadchromium_src-eb25a619587ab419e2a4f5d3486b8bb2d8e8a5ff.zip
chromium_src-eb25a619587ab419e2a4f5d3486b8bb2d8e8a5ff.tar.gz
chromium_src-eb25a619587ab419e2a4f5d3486b8bb2d8e8a5ff.tar.bz2
Update {virtual,override,final} to follow C++11 style in ui.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was automatically generated with a ChromeOS build using a variation of https://codereview.chromium.org/598073004. BUG=417463 R=avi@chromium.org Review URL: https://codereview.chromium.org/853073002 Cr-Commit-Position: refs/heads/master@{#311759}
Diffstat (limited to 'ui/base/ime/input_method_chromeos.h')
-rw-r--r--ui/base/ime/input_method_chromeos.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/ui/base/ime/input_method_chromeos.h b/ui/base/ime/input_method_chromeos.h
index 1022b04..3de4157 100644
--- a/ui/base/ime/input_method_chromeos.h
+++ b/ui/base/ime/input_method_chromeos.h
@@ -25,21 +25,21 @@ class UI_BASE_EXPORT InputMethodChromeOS
public chromeos::IMEInputContextHandlerInterface {
public:
explicit InputMethodChromeOS(internal::InputMethodDelegate* delegate);
- virtual ~InputMethodChromeOS();
+ ~InputMethodChromeOS() override;
// Overridden from InputMethod:
- 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;
+ void OnFocus() override;
+ void OnBlur() override;
+ bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
+ NativeEventResult* result) override;
+ bool DispatchKeyEvent(const ui::KeyEvent& event) override;
+ void OnTextInputTypeChanged(const TextInputClient* client) override;
+ void OnCaretBoundsChanged(const TextInputClient* client) override;
+ void CancelComposition(const TextInputClient* client) override;
+ void OnInputLocaleChanged() override;
+ std::string GetInputLocale() override;
+ bool IsActive() override;
+ bool IsCandidatePopupOpen() const override;
protected:
// Converts |text| into CompositionText.
@@ -58,10 +58,10 @@ class UI_BASE_EXPORT InputMethodChromeOS
class PendingKeyEvent;
// Overridden from InputMethodBase:
- virtual void OnWillChangeFocusedClient(TextInputClient* focused_before,
- TextInputClient* focused) override;
- virtual void OnDidChangeFocusedClient(TextInputClient* focused_before,
- TextInputClient* focused) override;
+ void OnWillChangeFocusedClient(TextInputClient* focused_before,
+ TextInputClient* focused) override;
+ void OnDidChangeFocusedClient(TextInputClient* focused_before,
+ 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 UpdateCompositionText(const chromeos::CompositionText& text,
- uint32 cursor_pos,
- bool visible) override;
- virtual void DeleteSurroundingText(int32 offset, uint32 length) override;
+ void CommitText(const std::string& text) override;
+ void UpdateCompositionText(const chromeos::CompositionText& text,
+ uint32 cursor_pos,
+ bool visible) override;
+ void DeleteSurroundingText(int32 offset, uint32 length) override;
// Hides the composition text.
void HidePreeditText();