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

Unified Diff: ui/base/ime/win/tsf_input_scope.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/remote_input_method_win_unittest.cc ('k') | ui/base/models/list_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/win/tsf_input_scope.cc
diff --git a/ui/base/ime/win/tsf_input_scope.cc b/ui/base/ime/win/tsf_input_scope.cc
index f40f928a5f76fad9c35db01fbdbdc60fdcb92a43..1c248f159c882b17f61bc9e208a2fdd964467941 100644
--- a/ui/base/ime/win/tsf_input_scope.cc
+++ b/ui/base/ime/win/tsf_input_scope.cc
@@ -29,18 +29,18 @@ void AppendNonTrivialInputScope(std::vector<InputScope>* input_scopes,
input_scopes->push_back(input_scope);
}
-class TSFInputScope FINAL : public ITfInputScope {
+class TSFInputScope final : public ITfInputScope {
public:
explicit TSFInputScope(const std::vector<InputScope>& input_scopes)
: input_scopes_(input_scopes),
ref_count_(0) {}
// ITfInputScope:
- STDMETHOD_(ULONG, AddRef)() OVERRIDE {
+ STDMETHOD_(ULONG, AddRef)() override {
return InterlockedIncrement(&ref_count_);
}
- STDMETHOD_(ULONG, Release)() OVERRIDE {
+ STDMETHOD_(ULONG, Release)() override {
const LONG count = InterlockedDecrement(&ref_count_);
if (!count) {
delete this;
@@ -49,7 +49,7 @@ class TSFInputScope FINAL : public ITfInputScope {
return static_cast<ULONG>(count);
}
- STDMETHOD(QueryInterface)(REFIID iid, void** result) OVERRIDE {
+ STDMETHOD(QueryInterface)(REFIID iid, void** result) override {
if (!result)
return E_INVALIDARG;
if (iid == IID_IUnknown || iid == IID_ITfInputScope) {
@@ -62,7 +62,7 @@ class TSFInputScope FINAL : public ITfInputScope {
return S_OK;
}
- STDMETHOD(GetInputScopes)(InputScope** input_scopes, UINT* count) OVERRIDE {
+ STDMETHOD(GetInputScopes)(InputScope** input_scopes, UINT* count) override {
if (!count || !input_scopes)
return E_INVALIDARG;
*input_scopes = static_cast<InputScope*>(CoTaskMemAlloc(
@@ -78,19 +78,19 @@ class TSFInputScope FINAL : public ITfInputScope {
return S_OK;
}
- STDMETHOD(GetPhrase)(BSTR** phrases, UINT* count) OVERRIDE {
+ STDMETHOD(GetPhrase)(BSTR** phrases, UINT* count) override {
return E_NOTIMPL;
}
- STDMETHOD(GetRegularExpression)(BSTR* regexp) OVERRIDE {
+ STDMETHOD(GetRegularExpression)(BSTR* regexp) override {
return E_NOTIMPL;
}
- STDMETHOD(GetSRGS)(BSTR* srgs) OVERRIDE {
+ STDMETHOD(GetSRGS)(BSTR* srgs) override {
return E_NOTIMPL;
}
- STDMETHOD(GetXML)(BSTR* xml) OVERRIDE {
+ STDMETHOD(GetXML)(BSTR* xml) override {
return E_NOTIMPL;
}
« no previous file with comments | « ui/base/ime/remote_input_method_win_unittest.cc ('k') | ui/base/models/list_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698