summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormohan.reddy <mohan.reddy@samsung.com>2014-10-06 08:14:20 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-06 15:14:36 +0000
commitf117299b515072190e4002b4ae758db9607be681 (patch)
tree408d0710d4e67351ed423500bf8d72229b19d839
parent638fd27af15ed4cb5cefc14cd4aede2823cf7e10 (diff)
downloadchromium_src-f117299b515072190e4002b4ae758db9607be681.zip
chromium_src-f117299b515072190e4002b4ae758db9607be681.tar.gz
chromium_src-f117299b515072190e4002b4ae758db9607be681.tar.bz2
Replacing the OVERRIDE with override and FINAL with final in win8 folder
This step is a giant search and replace for OVERRIDE and FINAL to replace them with their lowercase versions. BUG=417463 Review URL: https://codereview.chromium.org/625073003 Cr-Commit-Position: refs/heads/master@{#298240}
-rw-r--r--win8/metro_driver/chrome_app_view_ash.cc4
-rw-r--r--win8/metro_driver/chrome_app_view_ash.h8
-rw-r--r--win8/metro_driver/file_picker.cc4
-rw-r--r--win8/metro_driver/file_picker_ash.h6
-rw-r--r--win8/metro_driver/ime/input_scope.cc10
-rw-r--r--win8/metro_driver/ime/input_source.cc10
-rw-r--r--win8/metro_driver/ime/text_service.cc12
-rw-r--r--win8/metro_driver/ime/text_store.h60
-rw-r--r--win8/metro_driver/metro_driver_win7.cc4
-rw-r--r--win8/viewer/metro_viewer_process_host.h8
10 files changed, 63 insertions, 63 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc
index 8c4df51..dcc7e0f 100644
--- a/win8/metro_driver/chrome_app_view_ash.cc
+++ b/win8/metro_driver/chrome_app_view_ash.cc
@@ -146,7 +146,7 @@ class ChromeChannelListener : public IPC::Listener {
: ui_proxy_(ui_loop->message_loop_proxy()),
app_view_(app_view) {}
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+ virtual bool OnMessageReceived(const IPC::Message& message) override {
IPC_BEGIN_MESSAGE_MAP(ChromeChannelListener, message)
IPC_MESSAGE_HANDLER(MetroViewerHostMsg_ActivateDesktop,
OnActivateDesktop)
@@ -170,7 +170,7 @@ class ChromeChannelListener : public IPC::Listener {
return true;
}
- virtual void OnChannelError() OVERRIDE {
+ virtual void OnChannelError() override {
DVLOG(1) << "Channel error. Exiting.";
ui_proxy_->PostTask(FROM_HERE,
base::Bind(&ChromeAppViewAsh::OnMetroExit, base::Unretained(app_view_),
diff --git a/win8/metro_driver/chrome_app_view_ash.h b/win8/metro_driver/chrome_app_view_ash.h
index 0a88fad..4ad011f 100644
--- a/win8/metro_driver/chrome_app_view_ash.h
+++ b/win8/metro_driver/chrome_app_view_ash.h
@@ -120,18 +120,18 @@ class ChromeAppViewAsh
class PointerInfoHandler;
// ImePopupObserver overrides.
- virtual void OnImePopupChanged(ImePopupObserver::EventType event) OVERRIDE;
+ virtual void OnImePopupChanged(ImePopupObserver::EventType event) override;
// InputSourceObserver overrides.
- virtual void OnInputSourceChanged() OVERRIDE;
+ virtual void OnInputSourceChanged() override;
// TextServiceDelegate overrides.
virtual void OnCompositionChanged(
const base::string16& text,
int32 selection_start,
int32 selection_end,
- const std::vector<metro_viewer::UnderlineInfo>& underlines) OVERRIDE;
- virtual void OnTextCommitted(const base::string16& text) OVERRIDE;
+ const std::vector<metro_viewer::UnderlineInfo>& underlines) override;
+ virtual void OnTextCommitted(const base::string16& text) override;
// Convenience for sending a MetroViewerHostMsg_MouseButton with the specified
// parameters.
diff --git a/win8/metro_driver/file_picker.cc b/win8/metro_driver/file_picker.cc
index f824869..978386e 100644
--- a/win8/metro_driver/file_picker.cc
+++ b/win8/metro_driver/file_picker.cc
@@ -114,7 +114,7 @@ class OpenFilePickerSession : public FilePickerSessionBase {
explicit OpenFilePickerSession(OPENFILENAME* open_file_name);
private:
- virtual HRESULT StartFilePicker() OVERRIDE;
+ virtual HRESULT StartFilePicker() override;
typedef winfoundtn::IAsyncOperation<winstorage::StorageFile*>
SingleFileAsyncOp;
@@ -142,7 +142,7 @@ class SaveFilePickerSession : public FilePickerSessionBase {
explicit SaveFilePickerSession(OPENFILENAME* open_file_name);
private:
- virtual HRESULT StartFilePicker() OVERRIDE;
+ virtual HRESULT StartFilePicker() override;
typedef winfoundtn::IAsyncOperation<winstorage::StorageFile*>
SaveFileAsyncOp;
diff --git a/win8/metro_driver/file_picker_ash.h b/win8/metro_driver/file_picker_ash.h
index d3de43c..2f5d996 100644
--- a/win8/metro_driver/file_picker_ash.h
+++ b/win8/metro_driver/file_picker_ash.h
@@ -92,7 +92,7 @@ class OpenFilePickerSession : public FilePickerSessionBase {
}
private:
- virtual HRESULT StartFilePicker() OVERRIDE;
+ virtual HRESULT StartFilePicker() override;
typedef winfoundtn::IAsyncOperation<winstorage::StorageFile*>
SingleFileAsyncOp;
@@ -132,7 +132,7 @@ class SaveFilePickerSession : public FilePickerSessionBase {
int SaveFilePickerSession::filter_index() const;
private:
- virtual HRESULT StartFilePicker() OVERRIDE;
+ virtual HRESULT StartFilePicker() override;
typedef winfoundtn::IAsyncOperation<winstorage::StorageFile*>
SaveFileAsyncOp;
@@ -152,7 +152,7 @@ class FolderPickerSession : public FilePickerSessionBase {
const base::string16& title);
private:
- virtual HRESULT StartFilePicker() OVERRIDE;
+ virtual HRESULT StartFilePicker() override;
typedef winfoundtn::IAsyncOperation<winstorage::StorageFolder*>
FolderPickerAsyncOp;
diff --git a/win8/metro_driver/ime/input_scope.cc b/win8/metro_driver/ime/input_scope.cc
index 82679c3..7eb60b2 100644
--- a/win8/metro_driver/ime/input_scope.cc
+++ b/win8/metro_driver/ime/input_scope.cc
@@ -36,7 +36,7 @@ class ATL_NO_VTABLE InputScopeImpl
private:
// ITfInputScope overrides:
- 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*>(
@@ -49,16 +49,16 @@ class ATL_NO_VTABLE InputScopeImpl
*count = static_cast<UINT>(input_scopes_.size());
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;
}
diff --git a/win8/metro_driver/ime/input_source.cc b/win8/metro_driver/ime/input_source.cc
index dd27380..9f549d7 100644
--- a/win8/metro_driver/ime/input_source.cc
+++ b/win8/metro_driver/ime/input_source.cc
@@ -63,14 +63,14 @@ class ATL_NO_VTABLE InputSourceMonitor
private:
// ITfLanguageProfileNotifySink overrides:
- STDMETHOD(OnLanguageChange)(LANGID langid, BOOL *accept) OVERRIDE {
+ STDMETHOD(OnLanguageChange)(LANGID langid, BOOL *accept) override {
if (!accept)
return E_INVALIDARG;
*accept = TRUE;
return S_OK;
}
- STDMETHOD(OnLanguageChanged)() OVERRIDE {
+ STDMETHOD(OnLanguageChanged)() override {
if (!on_language_chanaged_.is_null())
on_language_chanaged_.Run();
return S_OK;
@@ -99,7 +99,7 @@ class InputSourceImpl : public InputSource {
private:
// InputSource overrides.
- virtual bool GetActiveSource(LANGID* langid, bool* is_ime) OVERRIDE {
+ virtual bool GetActiveSource(LANGID* langid, bool* is_ime) override {
TF_INPUTPROCESSORPROFILE profile = {};
HRESULT hr = profile_manager_->GetActiveProfile(GUID_TFCAT_TIP_KEYBOARD,
&profile);
@@ -112,10 +112,10 @@ class InputSourceImpl : public InputSource {
*is_ime = profile.dwProfileType == TF_PROFILETYPE_INPUTPROCESSOR;
return true;
}
- virtual void AddObserver(InputSourceObserver* observer) OVERRIDE {
+ virtual void AddObserver(InputSourceObserver* observer) override {
observer_list_.AddObserver(observer);
}
- virtual void RemoveObserver(InputSourceObserver* observer) OVERRIDE {
+ virtual void RemoveObserver(InputSourceObserver* observer) override {
observer_list_.RemoveObserver(observer);
}
void OnLanguageChanged() {
diff --git a/win8/metro_driver/ime/text_service.cc b/win8/metro_driver/ime/text_service.cc
index dbb74f3..986288e 100644
--- a/win8/metro_driver/ime/text_service.cc
+++ b/win8/metro_driver/ime/text_service.cc
@@ -334,7 +334,7 @@ class TextServiceImpl : public TextService,
private:
// TextService overrides:
- virtual void CancelComposition() OVERRIDE {
+ virtual void CancelComposition() override {
if (!current_document_) {
VLOG(0) << "|current_document_| is NULL due to the previous error.";
return;
@@ -348,7 +348,7 @@ class TextServiceImpl : public TextService,
virtual void OnDocumentChanged(
const std::vector<int32>& input_scopes,
const std::vector<metro_viewer::CharacterBounds>& character_bounds)
- OVERRIDE {
+ override {
bool document_type_changed = input_scopes_ != input_scopes;
input_scopes_ = input_scopes;
composition_character_bounds_ = character_bounds;
@@ -356,7 +356,7 @@ class TextServiceImpl : public TextService,
OnDocumentTypeChanged(input_scopes);
}
- virtual void OnWindowActivated() OVERRIDE {
+ virtual void OnWindowActivated() override {
if (!current_document_) {
VLOG(0) << "|current_document_| is NULL due to the previous error.";
return;
@@ -377,7 +377,7 @@ class TextServiceImpl : public TextService,
const base::string16& text,
int32 selection_start,
int32 selection_end,
- const std::vector<metro_viewer::UnderlineInfo>& underlines) OVERRIDE {
+ const std::vector<metro_viewer::UnderlineInfo>& underlines) override {
if (!delegate_)
return;
delegate_->OnCompositionChanged(text,
@@ -386,7 +386,7 @@ class TextServiceImpl : public TextService,
underlines);
}
- virtual void OnTextCommitted(const base::string16& text) OVERRIDE {
+ virtual void OnTextCommitted(const base::string16& text) override {
if (!delegate_)
return;
delegate_->OnTextCommitted(text);
@@ -413,7 +413,7 @@ class TextServiceImpl : public TextService,
}
virtual bool GetCompositionCharacterBounds(uint32 index,
- RECT* rect) OVERRIDE {
+ RECT* rect) override {
if (index >= composition_character_bounds_.size()) {
return false;
}
diff --git a/win8/metro_driver/ime/text_store.h b/win8/metro_driver/ime/text_store.h
index 975592c..3af5bf2 100644
--- a/win8/metro_driver/ime/text_store.h
+++ b/win8/metro_driver/ime/text_store.h
@@ -102,7 +102,7 @@ class ATL_NO_VTABLE TextStore
END_COM_MAP()
// ITextStoreACP:
- STDMETHOD(AdviseSink)(REFIID iid, IUnknown* unknown, DWORD mask) OVERRIDE;
+ STDMETHOD(AdviseSink)(REFIID iid, IUnknown* unknown, DWORD mask) override;
STDMETHOD(FindNextAttrTransition)(LONG acp_start,
LONG acp_halt,
ULONG num_filter_attributes,
@@ -110,26 +110,26 @@ class ATL_NO_VTABLE TextStore
DWORD flags,
LONG* acp_next,
BOOL* found,
- LONG* found_offset) OVERRIDE;
+ LONG* found_offset) override;
STDMETHOD(GetACPFromPoint)(TsViewCookie view_cookie,
const POINT* point,
DWORD flags,
- LONG* acp) OVERRIDE;
- STDMETHOD(GetActiveView)(TsViewCookie* view_cookie) OVERRIDE;
+ LONG* acp) override;
+ STDMETHOD(GetActiveView)(TsViewCookie* view_cookie) override;
STDMETHOD(GetEmbedded)(LONG acp_pos,
REFGUID service,
REFIID iid,
- IUnknown** unknown) OVERRIDE;
- STDMETHOD(GetEndACP)(LONG* acp) OVERRIDE;
+ IUnknown** unknown) override;
+ STDMETHOD(GetEndACP)(LONG* acp) override;
STDMETHOD(GetFormattedText)(LONG acp_start,
LONG acp_end,
- IDataObject** data_object) OVERRIDE;
- STDMETHOD(GetScreenExt)(TsViewCookie view_cookie, RECT* rect) OVERRIDE;
+ IDataObject** data_object) override;
+ STDMETHOD(GetScreenExt)(TsViewCookie view_cookie, RECT* rect) override;
STDMETHOD(GetSelection)(ULONG selection_index,
ULONG selection_buffer_size,
TS_SELECTION_ACP* selection_buffer,
- ULONG* fetched_count) OVERRIDE;
- STDMETHOD(GetStatus)(TS_STATUS* pdcs) OVERRIDE;
+ ULONG* fetched_count) override;
+ STDMETHOD(GetStatus)(TS_STATUS* pdcs) override;
STDMETHOD(GetText)(LONG acp_start,
LONG acp_end,
wchar_t* text_buffer,
@@ -138,73 +138,73 @@ class ATL_NO_VTABLE TextStore
TS_RUNINFO* run_info_buffer,
ULONG run_info_buffer_size,
ULONG* run_info_buffer_copied,
- LONG* next_acp) OVERRIDE;
+ LONG* next_acp) override;
STDMETHOD(GetTextExt)(TsViewCookie view_cookie,
LONG acp_start,
LONG acp_end,
RECT* rect,
- BOOL* clipped) OVERRIDE;
- STDMETHOD(GetWnd)(TsViewCookie view_cookie, HWND* window_handle) OVERRIDE;
+ BOOL* clipped) override;
+ STDMETHOD(GetWnd)(TsViewCookie view_cookie, HWND* window_handle) override;
STDMETHOD(InsertEmbedded)(DWORD flags,
LONG acp_start,
LONG acp_end,
IDataObject* data_object,
- TS_TEXTCHANGE* change) OVERRIDE;
+ TS_TEXTCHANGE* change) override;
STDMETHOD(InsertEmbeddedAtSelection)(DWORD flags,
IDataObject* data_object,
LONG* acp_start,
LONG* acp_end,
- TS_TEXTCHANGE* change) OVERRIDE;
+ TS_TEXTCHANGE* change) override;
STDMETHOD(InsertTextAtSelection)(DWORD flags,
const wchar_t* text_buffer,
ULONG text_buffer_size,
LONG* acp_start,
LONG* acp_end,
- TS_TEXTCHANGE* text_change) OVERRIDE;
+ TS_TEXTCHANGE* text_change) override;
STDMETHOD(QueryInsert)(LONG acp_test_start,
LONG acp_test_end,
ULONG text_size,
LONG* acp_result_start,
- LONG* acp_result_end) OVERRIDE;
+ LONG* acp_result_end) override;
STDMETHOD(QueryInsertEmbedded)(const GUID* service,
const FORMATETC* format,
- BOOL* insertable) OVERRIDE;
+ BOOL* insertable) override;
STDMETHOD(RequestAttrsAtPosition)(LONG acp_pos,
ULONG attribute_buffer_size,
const TS_ATTRID* attribute_buffer,
- DWORD flags) OVERRIDE;
+ DWORD flags) override;
STDMETHOD(RequestAttrsTransitioningAtPosition)(
LONG acp_pos,
ULONG attribute_buffer_size,
const TS_ATTRID* attribute_buffer,
- DWORD flags) OVERRIDE;
- STDMETHOD(RequestLock)(DWORD lock_flags, HRESULT* result) OVERRIDE;
+ DWORD flags) override;
+ STDMETHOD(RequestLock)(DWORD lock_flags, HRESULT* result) override;
STDMETHOD(RequestSupportedAttrs)(DWORD flags,
ULONG attribute_buffer_size,
- const TS_ATTRID* attribute_buffer) OVERRIDE;
+ const TS_ATTRID* attribute_buffer) override;
STDMETHOD(RetrieveRequestedAttrs)(ULONG attribute_buffer_size,
TS_ATTRVAL* attribute_buffer,
- ULONG* attribute_buffer_copied) OVERRIDE;
+ ULONG* attribute_buffer_copied) override;
STDMETHOD(SetSelection)(ULONG selection_buffer_size,
- const TS_SELECTION_ACP* selection_buffer) OVERRIDE;
+ const TS_SELECTION_ACP* selection_buffer) override;
STDMETHOD(SetText)(DWORD flags,
LONG acp_start,
LONG acp_end,
const wchar_t* text_buffer,
ULONG text_buffer_size,
- TS_TEXTCHANGE* text_change) OVERRIDE;
- STDMETHOD(UnadviseSink)(IUnknown* unknown) OVERRIDE;
+ TS_TEXTCHANGE* text_change) override;
+ STDMETHOD(UnadviseSink)(IUnknown* unknown) override;
// ITfContextOwnerCompositionSink:
STDMETHOD(OnStartComposition)(ITfCompositionView* composition_view,
- BOOL* ok) OVERRIDE;
+ BOOL* ok) override;
STDMETHOD(OnUpdateComposition)(ITfCompositionView* composition_view,
- ITfRange* range) OVERRIDE;
- STDMETHOD(OnEndComposition)(ITfCompositionView* composition_view) OVERRIDE;
+ ITfRange* range) override;
+ STDMETHOD(OnEndComposition)(ITfCompositionView* composition_view) override;
// ITfTextEditSink:
STDMETHOD(OnEndEdit)(ITfContext* context, TfEditCookie read_only_edit_cookie,
- ITfEditRecord* edit_record) OVERRIDE;
+ ITfEditRecord* edit_record) override;
// Cancels the ongoing composition if exists.
bool CancelComposition();
diff --git a/win8/metro_driver/metro_driver_win7.cc b/win8/metro_driver/metro_driver_win7.cc
index 893cf25..618cfb3 100644
--- a/win8/metro_driver/metro_driver_win7.cc
+++ b/win8/metro_driver/metro_driver_win7.cc
@@ -912,7 +912,7 @@ class CoreWindowEmulation
}
// InputHandler
- virtual bool HandleKeyboardMessage(const MSG& msg) OVERRIDE {
+ virtual bool HandleKeyboardMessage(const MSG& msg) override {
switch (msg.message) {
case WM_KEYDOWN:
case WM_KEYUP: {
@@ -943,7 +943,7 @@ class CoreWindowEmulation
return true;
}
- virtual bool HandleMouseMessage(const MSG& msg) OVERRIDE {
+ virtual bool HandleMouseMessage(const MSG& msg) override {
PointerEventHandler* handler = NULL;
mswr::ComPtr<winui::Core::IPointerEventArgs> event_args;
event_args = mswr::Make<MouseEvent>(msg);
diff --git a/win8/viewer/metro_viewer_process_host.h b/win8/viewer/metro_viewer_process_host.h
index 19e9627..1e47e8e 100644
--- a/win8/viewer/metro_viewer_process_host.h
+++ b/win8/viewer/metro_viewer_process_host.h
@@ -119,11 +119,11 @@ class METRO_VIEWER_EXPORT MetroViewerProcessHost : public IPC::Listener,
protected:
// IPC::Sender implementation:
- virtual bool Send(IPC::Message* msg) OVERRIDE;
+ virtual bool Send(IPC::Message* msg) override;
// IPC::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
- virtual void OnChannelError() OVERRIDE = 0;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
+ virtual void OnChannelError() override = 0;
private:
// The following are the implementation for the corresponding static methods
@@ -187,7 +187,7 @@ class METRO_VIEWER_EXPORT MetroViewerProcessHost : public IPC::Listener,
InternalMessageFilter(MetroViewerProcessHost* owner);
// IPC::MessageFilter implementation.
- virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) override;
private:
MetroViewerProcessHost* owner_;