diff options
author | nick <nick@chromium.org> | 2015-04-23 11:10:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 18:11:43 +0000 |
commit | 68fbc356f2cd540da8e65cd1896043c7b4e7d3cb (patch) | |
tree | fde12669f23304e93d967322631ff5173de52d07 /win8 | |
parent | 6bc5e1c9551f60c49d358efcff75c5c15f231df1 (diff) | |
download | chromium_src-68fbc356f2cd540da8e65cd1896043c7b4e7d3cb.zip chromium_src-68fbc356f2cd540da8e65cd1896043c7b4e7d3cb.tar.gz chromium_src-68fbc356f2cd540da8e65cd1896043c7b4e7d3cb.tar.bz2 |
Update {virtual,override} to follow C++11 style in win8.
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 manually generated using a regex and a text editor.
BUG=417463
Review URL: https://codereview.chromium.org/1101663006
Cr-Commit-Position: refs/heads/master@{#326578}
Diffstat (limited to 'win8')
-rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 4 | ||||
-rw-r--r-- | win8/metro_driver/chrome_app_view_ash.h | 10 | ||||
-rw-r--r-- | win8/metro_driver/file_picker.cc | 4 | ||||
-rw-r--r-- | win8/metro_driver/file_picker_ash.h | 6 | ||||
-rw-r--r-- | win8/metro_driver/ime/input_source.cc | 8 | ||||
-rw-r--r-- | win8/metro_driver/ime/text_service.cc | 17 | ||||
-rw-r--r-- | win8/metro_driver/metro_driver_win7.cc | 91 | ||||
-rw-r--r-- | win8/viewer/metro_viewer_process_host.h | 10 |
8 files changed, 74 insertions, 76 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index edcf4b7..3665760 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 { + 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 { + 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 4ad011f..366f507 100644 --- a/win8/metro_driver/chrome_app_view_ash.h +++ b/win8/metro_driver/chrome_app_view_ash.h @@ -59,7 +59,7 @@ class ChromeAppViewAsh public metro_driver::TextServiceDelegate { public: ChromeAppViewAsh(); - ~ChromeAppViewAsh(); + ~ChromeAppViewAsh() override; // IViewProvider overrides. IFACEMETHOD(Initialize)(winapp::Core::ICoreApplicationView* view); @@ -120,18 +120,18 @@ class ChromeAppViewAsh class PointerInfoHandler; // ImePopupObserver overrides. - virtual void OnImePopupChanged(ImePopupObserver::EventType event) override; + void OnImePopupChanged(ImePopupObserver::EventType event) override; // InputSourceObserver overrides. - virtual void OnInputSourceChanged() override; + void OnInputSourceChanged() override; // TextServiceDelegate overrides. - virtual void OnCompositionChanged( + 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; + 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 978386e..1ccfbb9 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; + 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; + 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 2f5d996..91eee2f 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; + 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; + 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; + HRESULT StartFilePicker() override; typedef winfoundtn::IAsyncOperation<winstorage::StorageFolder*> FolderPickerAsyncOp; diff --git a/win8/metro_driver/ime/input_source.cc b/win8/metro_driver/ime/input_source.cc index 6a63751..c734ad2 100644 --- a/win8/metro_driver/ime/input_source.cc +++ b/win8/metro_driver/ime/input_source.cc @@ -92,14 +92,14 @@ class InputSourceImpl : public InputSource { monitor_->SetCallback(base::Bind(&InputSourceImpl::OnLanguageChanged, base::Unretained(this))); } - virtual ~InputSourceImpl() { + ~InputSourceImpl() override { monitor_->SetCallback(base::Closure()); monitor_->Unadvise(); } private: // InputSource overrides. - virtual bool GetActiveSource(LANGID* langid, bool* is_ime) override { + 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 { + void AddObserver(InputSourceObserver* observer) override { observer_list_.AddObserver(observer); } - virtual void RemoveObserver(InputSourceObserver* observer) override { + 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 4601f27..ebfc23a 100644 --- a/win8/metro_driver/ime/text_service.cc +++ b/win8/metro_driver/ime/text_service.cc @@ -326,13 +326,13 @@ class TextServiceImpl : public TextService, DCHECK(window_handle != NULL); DCHECK(thread_manager_.get()); } - virtual ~TextServiceImpl() { + ~TextServiceImpl() override { thread_manager_->Deactivate(); } private: // TextService overrides: - virtual void CancelComposition() override { + void CancelComposition() override { if (!current_document_) { VLOG(0) << "|current_document_| is NULL due to the previous error."; return; @@ -343,7 +343,7 @@ class TextServiceImpl : public TextService, text_store->CancelComposition(); } - virtual void OnDocumentChanged( + void OnDocumentChanged( const std::vector<int32>& input_scopes, const std::vector<metro_viewer::CharacterBounds>& character_bounds) override { @@ -354,7 +354,7 @@ class TextServiceImpl : public TextService, OnDocumentTypeChanged(input_scopes); } - virtual void OnWindowActivated() override { + void OnWindowActivated() override { if (!current_document_) { VLOG(0) << "|current_document_| is NULL due to the previous error."; return; @@ -371,7 +371,7 @@ class TextServiceImpl : public TextService, } } - virtual void OnCompositionChanged( + void OnCompositionChanged( const base::string16& text, int32 selection_start, int32 selection_end, @@ -384,13 +384,13 @@ class TextServiceImpl : public TextService, underlines); } - virtual void OnTextCommitted(const base::string16& text) override { + void OnTextCommitted(const base::string16& text) override { if (!delegate_) return; delegate_->OnTextCommitted(text); } - virtual RECT GetCaretBounds() override { + RECT GetCaretBounds() override { if (composition_character_bounds_.empty()) { const RECT rect = {}; return rect; @@ -410,8 +410,7 @@ class TextServiceImpl : public TextService, return rect; } - virtual bool GetCompositionCharacterBounds(uint32 index, - RECT* rect) override { + bool GetCompositionCharacterBounds(uint32 index, RECT* rect) override { if (index >= composition_character_bounds_.size()) { return false; } diff --git a/win8/metro_driver/metro_driver_win7.cc b/win8/metro_driver/metro_driver_win7.cc index d5496d6..4dde00b 100644 --- a/win8/metro_driver/metro_driver_win7.cc +++ b/win8/metro_driver/metro_driver_win7.cc @@ -569,7 +569,7 @@ class CoreWindowEmulation ::SetProp(core_hwnd_, kAshWin7CoreWindowHandler, this); } - ~CoreWindowEmulation() { + ~CoreWindowEmulation() override { if (core_hwnd_) { ::RemoveProp(core_hwnd_, kAshWin7CoreWindowHandler); ::DestroyWindow(core_hwnd_); @@ -642,38 +642,38 @@ class CoreWindowEmulation return S_OK; } - virtual HRESULT STDMETHODCALLTYPE Activate(void) override { + HRESULT STDMETHODCALLTYPE Activate(void) override { // After we fire OnActivate on the View, Chrome calls us back here. return S_OK; } - virtual HRESULT STDMETHODCALLTYPE Close(void) override { + HRESULT STDMETHODCALLTYPE Close(void) override { ::PostMessage(core_hwnd_, WM_CLOSE, 0, 0); core_hwnd_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE GetAsyncKeyState( + HRESULT STDMETHODCALLTYPE GetAsyncKeyState( ABI::Windows::System::VirtualKey virtualKey, winui::Core::CoreVirtualKeyStates* KeyState) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE GetKeyState( + HRESULT STDMETHODCALLTYPE GetKeyState( ABI::Windows::System::VirtualKey virtualKey, winui::Core::CoreVirtualKeyStates* KeyState) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE ReleasePointerCapture(void) override { + HRESULT STDMETHODCALLTYPE ReleasePointerCapture(void) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE SetPointerCapture(void) override { + HRESULT STDMETHODCALLTYPE SetPointerCapture(void) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_Activated( + HRESULT STDMETHODCALLTYPE add_Activated( WindowActivatedHandler* handler, EventRegistrationToken* pCookie) override { window_activated_handler_ = handler; @@ -681,25 +681,25 @@ class CoreWindowEmulation return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_Activated( + HRESULT STDMETHODCALLTYPE remove_Activated( EventRegistrationToken cookie) override { window_activated_handler_->Release(); window_activated_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_AutomationProviderRequested( + HRESULT STDMETHODCALLTYPE add_AutomationProviderRequested( AutomationProviderHandler* handler, EventRegistrationToken* cookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_AutomationProviderRequested( + HRESULT STDMETHODCALLTYPE remove_AutomationProviderRequested( EventRegistrationToken cookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_CharacterReceived( + HRESULT STDMETHODCALLTYPE add_CharacterReceived( CharEventHandler* handler, EventRegistrationToken* pCookie) override { character_received_handler_ = handler; @@ -707,36 +707,36 @@ class CoreWindowEmulation return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_CharacterReceived( + HRESULT STDMETHODCALLTYPE remove_CharacterReceived( EventRegistrationToken cookie) override { character_received_handler_->Release(); character_received_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_Closed( + HRESULT STDMETHODCALLTYPE add_Closed( CoreWindowEventHandler* handler, EventRegistrationToken* pCookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_Closed( + HRESULT STDMETHODCALLTYPE remove_Closed( EventRegistrationToken cookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_InputEnabled( + HRESULT STDMETHODCALLTYPE add_InputEnabled( InputEnabledEventHandler* handler, EventRegistrationToken* pCookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_InputEnabled( + HRESULT STDMETHODCALLTYPE remove_InputEnabled( EventRegistrationToken cookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_KeyDown( + HRESULT STDMETHODCALLTYPE add_KeyDown( KeyEventHandler* handler, EventRegistrationToken* pCookie) override { key_down_handler_ = handler; @@ -744,14 +744,14 @@ class CoreWindowEmulation return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_KeyDown( + HRESULT STDMETHODCALLTYPE remove_KeyDown( EventRegistrationToken cookie) override { key_down_handler_->Release(); key_down_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_KeyUp( + HRESULT STDMETHODCALLTYPE add_KeyUp( KeyEventHandler* handler, EventRegistrationToken* pCookie) override { key_up_handler_ = handler; @@ -759,53 +759,53 @@ class CoreWindowEmulation return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_KeyUp( + HRESULT STDMETHODCALLTYPE remove_KeyUp( EventRegistrationToken cookie) override { key_up_handler_->Release(); key_up_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_PointerCaptureLost( + HRESULT STDMETHODCALLTYPE add_PointerCaptureLost( PointerEventHandler* handler, EventRegistrationToken* cookie) override { mouse_capture_lost_handler_ = handler; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_PointerCaptureLost( + HRESULT STDMETHODCALLTYPE remove_PointerCaptureLost( EventRegistrationToken cookie) override { mouse_capture_lost_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_PointerEntered( + HRESULT STDMETHODCALLTYPE add_PointerEntered( PointerEventHandler* handler, EventRegistrationToken* cookie) override { mouse_entered_handler_ = handler; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_PointerEntered( + HRESULT STDMETHODCALLTYPE remove_PointerEntered( EventRegistrationToken cookie) override { mouse_entered_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_PointerExited( + HRESULT STDMETHODCALLTYPE add_PointerExited( PointerEventHandler* handler, EventRegistrationToken* cookie) override { mouse_exited_handler_ = handler; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_PointerExited( + HRESULT STDMETHODCALLTYPE remove_PointerExited( EventRegistrationToken cookie) override { mouse_exited_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_PointerMoved( + HRESULT STDMETHODCALLTYPE add_PointerMoved( PointerEventHandler* handler, EventRegistrationToken* cookie) override { mouse_moved_handler_ = handler; @@ -813,14 +813,14 @@ class CoreWindowEmulation return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_PointerMoved( + HRESULT STDMETHODCALLTYPE remove_PointerMoved( EventRegistrationToken cookie) override { mouse_moved_handler_->Release(); mouse_moved_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_PointerPressed( + HRESULT STDMETHODCALLTYPE add_PointerPressed( PointerEventHandler* handler, EventRegistrationToken* cookie) override { mouse_pressed_handler_ = handler; @@ -828,14 +828,14 @@ class CoreWindowEmulation return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_PointerPressed( + HRESULT STDMETHODCALLTYPE remove_PointerPressed( EventRegistrationToken cookie) override { mouse_pressed_handler_->Release(); mouse_pressed_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_PointerReleased( + HRESULT STDMETHODCALLTYPE add_PointerReleased( PointerEventHandler* handler, EventRegistrationToken* cookie) override { mouse_released_handler_ = handler; @@ -843,25 +843,25 @@ class CoreWindowEmulation return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_PointerReleased( + HRESULT STDMETHODCALLTYPE remove_PointerReleased( EventRegistrationToken cookie) override { mouse_released_handler_->Release(); mouse_released_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_TouchHitTesting( + HRESULT STDMETHODCALLTYPE add_TouchHitTesting( TouchHitTestHandler* handler, EventRegistrationToken* pCookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_TouchHitTesting( + HRESULT STDMETHODCALLTYPE remove_TouchHitTesting( EventRegistrationToken cookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_PointerWheelChanged( + HRESULT STDMETHODCALLTYPE add_PointerWheelChanged( PointerEventHandler* handler, EventRegistrationToken* cookie) override { mouse_wheel_changed_handler_ = handler; @@ -869,51 +869,50 @@ class CoreWindowEmulation return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_PointerWheelChanged( + HRESULT STDMETHODCALLTYPE remove_PointerWheelChanged( EventRegistrationToken cookie) override { mouse_wheel_changed_handler_->Release(); mouse_wheel_changed_handler_ = NULL; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_SizeChanged( + HRESULT STDMETHODCALLTYPE add_SizeChanged( SizeChangedHandler* handler, EventRegistrationToken* pCookie) override { // TODO(cpu): implement this. return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_SizeChanged( + HRESULT STDMETHODCALLTYPE remove_SizeChanged( EventRegistrationToken cookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE add_VisibilityChanged( + HRESULT STDMETHODCALLTYPE add_VisibilityChanged( VisibilityChangedHandler* handler, EventRegistrationToken* pCookie) override { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE remove_VisibilityChanged( + HRESULT STDMETHODCALLTYPE remove_VisibilityChanged( EventRegistrationToken cookie) override { return S_OK; } // ICoreWindowInterop implementation: - virtual HRESULT STDMETHODCALLTYPE get_WindowHandle(HWND* hwnd) override { + HRESULT STDMETHODCALLTYPE get_WindowHandle(HWND* hwnd) override { if (!core_hwnd_) return E_FAIL; *hwnd = core_hwnd_; return S_OK; } - virtual HRESULT STDMETHODCALLTYPE put_MessageHandled( - boolean value) override { + HRESULT STDMETHODCALLTYPE put_MessageHandled(boolean value) override { return S_OK; } // InputHandler - virtual bool HandleKeyboardMessage(const MSG& msg) override { + bool HandleKeyboardMessage(const MSG& msg) override { switch (msg.message) { case WM_KEYDOWN: case WM_KEYUP: { @@ -944,7 +943,7 @@ class CoreWindowEmulation return true; } - virtual bool HandleMouseMessage(const MSG& msg) override { + 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 95f3688..12f4c88 100644 --- a/win8/viewer/metro_viewer_process_host.h +++ b/win8/viewer/metro_viewer_process_host.h @@ -57,7 +57,7 @@ class METRO_VIEWER_EXPORT MetroViewerProcessHost : public IPC::Listener, // LaunchViewerAndWaitForConnection(). explicit MetroViewerProcessHost( const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner); - virtual ~MetroViewerProcessHost(); + ~MetroViewerProcessHost() override; // Returns the process id of the viewer process if one is connected to this // host, returns base::kNullProcessId otherwise. @@ -120,11 +120,11 @@ class METRO_VIEWER_EXPORT MetroViewerProcessHost : public IPC::Listener, protected: // IPC::Sender implementation: - virtual bool Send(IPC::Message* msg) override; + bool Send(IPC::Message* msg) override; // IPC::Listener implementation: - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnChannelError() override = 0; + bool OnMessageReceived(const IPC::Message& message) override; + void OnChannelError() override = 0; private: // The following are the implementation for the corresponding static methods @@ -188,7 +188,7 @@ class METRO_VIEWER_EXPORT MetroViewerProcessHost : public IPC::Listener, InternalMessageFilter(MetroViewerProcessHost* owner); // IPC::MessageFilter implementation. - virtual void OnChannelConnected(int32 peer_pid) override; + void OnChannelConnected(int32 peer_pid) override; private: MetroViewerProcessHost* owner_; |