Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: ui/base/ime/remote_input_method_win.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/mock_input_method.h ('k') | ui/base/ime/remote_input_method_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/remote_input_method_win.cc
diff --git a/ui/base/ime/remote_input_method_win.cc b/ui/base/ime/remote_input_method_win.cc
index 9fad0adbd957c5e7ef7e673202bd6cc44cd2e911..b01a39c1205f13542342032cbf7c0f5809dafb99 100644
--- a/ui/base/ime/remote_input_method_win.cc
+++ b/ui/base/ime/remote_input_method_win.cc
@@ -128,25 +128,25 @@ class RemoteInputMethodWin : public InputMethod,
private:
// Overridden from InputMethod:
- virtual void SetDelegate(internal::InputMethodDelegate* delegate) OVERRIDE {
+ virtual void SetDelegate(internal::InputMethodDelegate* delegate) override {
delegate_ = delegate;
}
- virtual void Init(bool focused) OVERRIDE {
+ virtual void Init(bool focused) override {
}
- virtual void OnFocus() OVERRIDE {
+ virtual void OnFocus() override {
}
- virtual void OnBlur() OVERRIDE {
+ virtual void OnBlur() override {
}
virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
- NativeEventResult* result) OVERRIDE {
+ NativeEventResult* result) override {
return false;
}
- virtual void SetFocusedTextInputClient(TextInputClient* client) OVERRIDE {
+ virtual void SetFocusedTextInputClient(TextInputClient* client) override {
std::vector<int32> prev_input_scopes;
std::swap(input_scopes_, prev_input_scopes);
std::vector<gfx::Rect> prev_bounds;
@@ -172,17 +172,17 @@ class RemoteInputMethodWin : public InputMethod,
composition_character_bounds_);
}
- virtual void DetachTextInputClient(TextInputClient* client) OVERRIDE {
+ virtual void DetachTextInputClient(TextInputClient* client) override {
if (text_input_client_ != client)
return;
SetFocusedTextInputClient(NULL);
}
- virtual TextInputClient* GetTextInputClient() const OVERRIDE {
+ virtual TextInputClient* GetTextInputClient() const override {
return text_input_client_;
}
- virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE {
+ virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override {
if (event.HasNativeEvent()) {
const base::NativeEvent& native_key_event = event.native_event();
if (native_key_event.message != WM_CHAR)
@@ -207,7 +207,7 @@ class RemoteInputMethodWin : public InputMethod,
return delegate_->DispatchKeyEventPostIME(event);
}
- virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE {
+ virtual void OnTextInputTypeChanged(const TextInputClient* client) override {
if (!text_input_client_ || text_input_client_ != client)
return;
std::vector<int32> prev_input_scopes;
@@ -220,7 +220,7 @@ class RemoteInputMethodWin : public InputMethod,
}
}
- virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE {
+ virtual void OnCaretBoundsChanged(const TextInputClient* client) override {
if (!text_input_client_ || text_input_client_ != client)
return;
std::vector<gfx::Rect> prev_rects;
@@ -232,15 +232,15 @@ class RemoteInputMethodWin : public InputMethod,
}
}
- virtual void CancelComposition(const TextInputClient* client) OVERRIDE {
+ virtual void CancelComposition(const TextInputClient* client) override {
if (CanSendRemoteNotification(client))
remote_delegate_->CancelComposition();
}
- virtual void OnInputLocaleChanged() OVERRIDE {
+ virtual void OnInputLocaleChanged() override {
}
- virtual std::string GetInputLocale() OVERRIDE {
+ virtual std::string GetInputLocale() override {
const LCID locale_id = MAKELCID(langid_, SORT_DEFAULT);
std::string language =
GetLocaleString(locale_id, LOCALE_SISO639LANGNAME);
@@ -253,42 +253,42 @@ class RemoteInputMethodWin : public InputMethod,
return language.append(1, '-').append(region);
}
- virtual bool IsActive() OVERRIDE {
+ virtual bool IsActive() override {
return true; // always turned on
}
- virtual TextInputType GetTextInputType() const OVERRIDE {
+ virtual TextInputType GetTextInputType() const override {
return text_input_client_ ? text_input_client_->GetTextInputType()
: TEXT_INPUT_TYPE_NONE;
}
- virtual TextInputMode GetTextInputMode() const OVERRIDE {
+ virtual TextInputMode GetTextInputMode() const override {
return text_input_client_ ? text_input_client_->GetTextInputMode()
: TEXT_INPUT_MODE_DEFAULT;
}
- virtual bool CanComposeInline() const OVERRIDE {
+ virtual bool CanComposeInline() const override {
return text_input_client_ ? text_input_client_->CanComposeInline() : true;
}
- virtual bool IsCandidatePopupOpen() const OVERRIDE {
+ virtual bool IsCandidatePopupOpen() const override {
return is_candidate_popup_open_;
}
- virtual void ShowImeIfNeeded() OVERRIDE {
+ virtual void ShowImeIfNeeded() override {
}
- virtual void AddObserver(InputMethodObserver* observer) OVERRIDE {
+ virtual void AddObserver(InputMethodObserver* observer) override {
observer_list_.AddObserver(observer);
}
- virtual void RemoveObserver(InputMethodObserver* observer) OVERRIDE {
+ virtual void RemoveObserver(InputMethodObserver* observer) override {
observer_list_.RemoveObserver(observer);
}
// Overridden from RemoteInputMethodPrivateWin:
virtual void SetRemoteDelegate(
- internal::RemoteInputMethodDelegateWin* delegate) OVERRIDE{
+ internal::RemoteInputMethodDelegateWin* delegate) override{
remote_delegate_ = delegate;
// Sync initial state.
@@ -298,7 +298,7 @@ class RemoteInputMethodWin : public InputMethod,
}
}
- virtual void OnCandidatePopupChanged(bool visible) OVERRIDE {
+ virtual void OnCandidatePopupChanged(bool visible) override {
is_candidate_popup_open_ = visible;
if (!text_input_client_)
return;
@@ -310,7 +310,7 @@ class RemoteInputMethodWin : public InputMethod,
text_input_client_->OnCandidateWindowHidden();
}
- virtual void OnInputSourceChanged(LANGID langid, bool /*is_ime*/) OVERRIDE {
+ virtual void OnInputSourceChanged(LANGID langid, bool /*is_ime*/) override {
// Note: Currently |is_ime| is not utilized yet.
const bool changed = (langid_ != langid);
langid_ = langid;
@@ -319,13 +319,13 @@ class RemoteInputMethodWin : public InputMethod,
}
virtual void OnCompositionChanged(
- const CompositionText& composition_text) OVERRIDE {
+ const CompositionText& composition_text) override {
if (!text_input_client_)
return;
text_input_client_->SetCompositionText(composition_text);
}
- virtual void OnTextCommitted(const base::string16& text) OVERRIDE {
+ virtual void OnTextCommitted(const base::string16& text) override {
if (!text_input_client_)
return;
if (text_input_client_->GetTextInputType() == TEXT_INPUT_TYPE_NONE) {
« no previous file with comments | « ui/base/ime/mock_input_method.h ('k') | ui/base/ime/remote_input_method_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698