diff --git a/libcef/browser/thread_util.h b/libcef/browser/thread_util.h index 46572f737..f57c4b404 100644 --- a/libcef/browser/thread_util.h +++ b/libcef/browser/thread_util.h @@ -82,16 +82,16 @@ // Same as IMPLEMENT_REFCOUNTING() but using the specified Destructor. #define IMPLEMENT_REFCOUNTING_EX(ClassName, Destructor) \ public: \ - void AddRef() const OVERRIDE { ref_count_.AddRef(); } \ - bool Release() const OVERRIDE { \ + void AddRef() const override { ref_count_.AddRef(); } \ + bool Release() const override { \ if (ref_count_.Release()) { \ Destructor::Destruct(this); \ return true; \ } \ return false; \ } \ - bool HasOneRef() const OVERRIDE { return ref_count_.HasOneRef(); } \ - bool HasAtLeastOneRef() const OVERRIDE { \ + bool HasOneRef() const override { return ref_count_.HasOneRef(); } \ + bool HasAtLeastOneRef() const override { \ return ref_count_.HasAtLeastOneRef(); \ } \ \ diff --git a/libcef_dll/ctocpp/auth_callback_ctocpp.h b/libcef_dll/ctocpp/auth_callback_ctocpp.h index 974bdbe17..a4d1ea91e 100644 --- a/libcef_dll/ctocpp/auth_callback_ctocpp.h +++ b/libcef_dll/ctocpp/auth_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e3a2949721f228e60049d3aee74253efd1d53f0d$ +// $hash=367bc9fe924f8e63f0c952c56c2f4ed0d6690f43$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_AUTH_CALLBACK_CTOCPP_H_ @@ -34,8 +34,8 @@ class CefAuthCallbackCToCpp : public CefCToCppRefCounted that) OVERRIDE; - bool IsEqual(CefRefPtr that) OVERRIDE; - CefRefPtr Copy() OVERRIDE; - size_t GetSize() OVERRIDE; - size_t GetData(void* buffer, size_t buffer_size, size_t data_offset) OVERRIDE; + bool IsValid() override; + bool IsOwned() override; + bool IsSame(CefRefPtr that) override; + bool IsEqual(CefRefPtr that) override; + CefRefPtr Copy() override; + size_t GetSize() override; + size_t GetData(void* buffer, size_t buffer_size, size_t data_offset) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_BINARY_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/browser_ctocpp.h b/libcef_dll/ctocpp/browser_ctocpp.h index c790f1efc..5c09ca9cd 100644 --- a/libcef_dll/ctocpp/browser_ctocpp.h +++ b/libcef_dll/ctocpp/browser_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b87b59400a1b0693d9f4ac37546c7d0ce5190ff7$ +// $hash=0d464b5cc5cafab59224cc9904cbbbddce9bcd3e$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ @@ -36,27 +36,27 @@ class CefBrowserCToCpp virtual ~CefBrowserCToCpp(); // CefBrowser methods. - bool IsValid() OVERRIDE; - CefRefPtr GetHost() OVERRIDE; - bool CanGoBack() OVERRIDE; - void GoBack() OVERRIDE; - bool CanGoForward() OVERRIDE; - void GoForward() OVERRIDE; - bool IsLoading() OVERRIDE; - void Reload() OVERRIDE; - void ReloadIgnoreCache() OVERRIDE; - void StopLoad() OVERRIDE; - int GetIdentifier() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - bool IsPopup() OVERRIDE; - bool HasDocument() OVERRIDE; - CefRefPtr GetMainFrame() OVERRIDE; - CefRefPtr GetFocusedFrame() OVERRIDE; - CefRefPtr GetFrame(int64 identifier) OVERRIDE; - CefRefPtr GetFrame(const CefString& name) OVERRIDE; - size_t GetFrameCount() OVERRIDE; - void GetFrameIdentifiers(std::vector& identifiers) OVERRIDE; - void GetFrameNames(std::vector& names) OVERRIDE; + bool IsValid() override; + CefRefPtr GetHost() override; + bool CanGoBack() override; + void GoBack() override; + bool CanGoForward() override; + void GoForward() override; + bool IsLoading() override; + void Reload() override; + void ReloadIgnoreCache() override; + void StopLoad() override; + int GetIdentifier() override; + bool IsSame(CefRefPtr that) override; + bool IsPopup() override; + bool HasDocument() override; + CefRefPtr GetMainFrame() override; + CefRefPtr GetFocusedFrame() override; + CefRefPtr GetFrame(int64 identifier) override; + CefRefPtr GetFrame(const CefString& name) override; + size_t GetFrameCount() override; + void GetFrameIdentifiers(std::vector& identifiers) override; + void GetFrameNames(std::vector& names) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.h b/libcef_dll/ctocpp/browser_host_ctocpp.h index e630d54cd..0349287c0 100644 --- a/libcef_dll/ctocpp/browser_host_ctocpp.h +++ b/libcef_dll/ctocpp/browser_host_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=95928a6e1311ff0406b502076defccc441d0b57c$ +// $hash=0de1d0125514efd66096e5e900938b6481f0ec1d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_BROWSER_HOST_CTOCPP_H_ @@ -37,103 +37,103 @@ class CefBrowserHostCToCpp : public CefCToCppRefCounted GetBrowser() OVERRIDE; - void CloseBrowser(bool force_close) OVERRIDE; - bool TryCloseBrowser() OVERRIDE; - void SetFocus(bool focus) OVERRIDE; - CefWindowHandle GetWindowHandle() OVERRIDE; - CefWindowHandle GetOpenerWindowHandle() OVERRIDE; - bool HasView() OVERRIDE; - CefRefPtr GetClient() OVERRIDE; - CefRefPtr GetRequestContext() OVERRIDE; - double GetZoomLevel() OVERRIDE; - void SetZoomLevel(double zoomLevel) OVERRIDE; + CefRefPtr GetBrowser() override; + void CloseBrowser(bool force_close) override; + bool TryCloseBrowser() override; + void SetFocus(bool focus) override; + CefWindowHandle GetWindowHandle() override; + CefWindowHandle GetOpenerWindowHandle() override; + bool HasView() override; + CefRefPtr GetClient() override; + CefRefPtr GetRequestContext() override; + double GetZoomLevel() override; + void SetZoomLevel(double zoomLevel) override; void RunFileDialog(FileDialogMode mode, const CefString& title, const CefString& default_file_path, const std::vector& accept_filters, int selected_accept_filter, - CefRefPtr callback) OVERRIDE; - void StartDownload(const CefString& url) OVERRIDE; + CefRefPtr callback) override; + void StartDownload(const CefString& url) override; void DownloadImage(const CefString& image_url, bool is_favicon, uint32 max_image_size, bool bypass_cache, - CefRefPtr callback) OVERRIDE; - void Print() OVERRIDE; + CefRefPtr callback) override; + void Print() override; void PrintToPDF(const CefString& path, const CefPdfPrintSettings& settings, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; void Find(int identifier, const CefString& searchText, bool forward, bool matchCase, - bool findNext) OVERRIDE; - void StopFinding(bool clearSelection) OVERRIDE; + bool findNext) override; + void StopFinding(bool clearSelection) override; void ShowDevTools(const CefWindowInfo& windowInfo, CefRefPtr client, const CefBrowserSettings& settings, - const CefPoint& inspect_element_at) OVERRIDE; - void CloseDevTools() OVERRIDE; - bool HasDevTools() OVERRIDE; - bool SendDevToolsMessage(const void* message, size_t message_size) OVERRIDE; + const CefPoint& inspect_element_at) override; + void CloseDevTools() override; + bool HasDevTools() override; + bool SendDevToolsMessage(const void* message, size_t message_size) override; int ExecuteDevToolsMethod(int message_id, const CefString& method, - CefRefPtr params) OVERRIDE; + CefRefPtr params) override; CefRefPtr AddDevToolsMessageObserver( - CefRefPtr observer) OVERRIDE; + CefRefPtr observer) override; void GetNavigationEntries(CefRefPtr visitor, - bool current_only) OVERRIDE; - void ReplaceMisspelling(const CefString& word) OVERRIDE; - void AddWordToDictionary(const CefString& word) OVERRIDE; - bool IsWindowRenderingDisabled() OVERRIDE; - void WasResized() OVERRIDE; - void WasHidden(bool hidden) OVERRIDE; - void NotifyScreenInfoChanged() OVERRIDE; - void Invalidate(PaintElementType type) OVERRIDE; - void SendExternalBeginFrame() OVERRIDE; - void SendKeyEvent(const CefKeyEvent& event) OVERRIDE; + bool current_only) override; + void ReplaceMisspelling(const CefString& word) override; + void AddWordToDictionary(const CefString& word) override; + bool IsWindowRenderingDisabled() override; + void WasResized() override; + void WasHidden(bool hidden) override; + void NotifyScreenInfoChanged() override; + void Invalidate(PaintElementType type) override; + void SendExternalBeginFrame() override; + void SendKeyEvent(const CefKeyEvent& event) override; void SendMouseClickEvent(const CefMouseEvent& event, MouseButtonType type, bool mouseUp, - int clickCount) OVERRIDE; - void SendMouseMoveEvent(const CefMouseEvent& event, bool mouseLeave) OVERRIDE; + int clickCount) override; + void SendMouseMoveEvent(const CefMouseEvent& event, bool mouseLeave) override; void SendMouseWheelEvent(const CefMouseEvent& event, int deltaX, - int deltaY) OVERRIDE; - void SendTouchEvent(const CefTouchEvent& event) OVERRIDE; - void SendFocusEvent(bool setFocus) OVERRIDE; - void SendCaptureLostEvent() OVERRIDE; - void NotifyMoveOrResizeStarted() OVERRIDE; - int GetWindowlessFrameRate() OVERRIDE; - void SetWindowlessFrameRate(int frame_rate) OVERRIDE; + int deltaY) override; + void SendTouchEvent(const CefTouchEvent& event) override; + void SendFocusEvent(bool setFocus) override; + void SendCaptureLostEvent() override; + void NotifyMoveOrResizeStarted() override; + int GetWindowlessFrameRate() override; + void SetWindowlessFrameRate(int frame_rate) override; void ImeSetComposition(const CefString& text, const std::vector& underlines, const CefRange& replacement_range, - const CefRange& selection_range) OVERRIDE; + const CefRange& selection_range) override; void ImeCommitText(const CefString& text, const CefRange& replacement_range, - int relative_cursor_pos) OVERRIDE; - void ImeFinishComposingText(bool keep_selection) OVERRIDE; - void ImeCancelComposition() OVERRIDE; + int relative_cursor_pos) override; + void ImeFinishComposingText(bool keep_selection) override; + void ImeCancelComposition() override; void DragTargetDragEnter(CefRefPtr drag_data, const CefMouseEvent& event, - DragOperationsMask allowed_ops) OVERRIDE; + DragOperationsMask allowed_ops) override; void DragTargetDragOver(const CefMouseEvent& event, - DragOperationsMask allowed_ops) OVERRIDE; - void DragTargetDragLeave() OVERRIDE; - void DragTargetDrop(const CefMouseEvent& event) OVERRIDE; - void DragSourceEndedAt(int x, int y, DragOperationsMask op) OVERRIDE; - void DragSourceSystemDragEnded() OVERRIDE; - CefRefPtr GetVisibleNavigationEntry() OVERRIDE; - void SetAccessibilityState(cef_state_t accessibility_state) OVERRIDE; + DragOperationsMask allowed_ops) override; + void DragTargetDragLeave() override; + void DragTargetDrop(const CefMouseEvent& event) override; + void DragSourceEndedAt(int x, int y, DragOperationsMask op) override; + void DragSourceSystemDragEnded() override; + CefRefPtr GetVisibleNavigationEntry() override; + void SetAccessibilityState(cef_state_t accessibility_state) override; void SetAutoResizeEnabled(bool enabled, const CefSize& min_size, - const CefSize& max_size) OVERRIDE; - CefRefPtr GetExtension() OVERRIDE; - bool IsBackgroundHost() OVERRIDE; - void SetAudioMuted(bool mute) OVERRIDE; - bool IsAudioMuted() OVERRIDE; + const CefSize& max_size) override; + CefRefPtr GetExtension() override; + bool IsBackgroundHost() override; + void SetAudioMuted(bool mute) override; + bool IsAudioMuted() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_BROWSER_HOST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/callback_ctocpp.h b/libcef_dll/ctocpp/callback_ctocpp.h index 52e70d76c..08e86abe6 100644 --- a/libcef_dll/ctocpp/callback_ctocpp.h +++ b/libcef_dll/ctocpp/callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d5bd0e618c060e9410fdd4760d1e941e443a8010$ +// $hash=cfe6a23edaeb6007470af483837252051ff1f878$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_CALLBACK_CTOCPP_H_ @@ -34,8 +34,8 @@ class CefCallbackCToCpp : public CefCToCppRefCounted Copy() OVERRIDE; - void InitFromArgv(int argc, const char* const* argv) OVERRIDE; - void InitFromString(const CefString& command_line) OVERRIDE; - void Reset() OVERRIDE; - void GetArgv(std::vector& argv) OVERRIDE; - CefString GetCommandLineString() OVERRIDE; - CefString GetProgram() OVERRIDE; - void SetProgram(const CefString& program) OVERRIDE; - bool HasSwitches() OVERRIDE; - bool HasSwitch(const CefString& name) OVERRIDE; - CefString GetSwitchValue(const CefString& name) OVERRIDE; - void GetSwitches(SwitchMap& switches) OVERRIDE; - void AppendSwitch(const CefString& name) OVERRIDE; + bool IsValid() override; + bool IsReadOnly() override; + CefRefPtr Copy() override; + void InitFromArgv(int argc, const char* const* argv) override; + void InitFromString(const CefString& command_line) override; + void Reset() override; + void GetArgv(std::vector& argv) override; + CefString GetCommandLineString() override; + CefString GetProgram() override; + void SetProgram(const CefString& program) override; + bool HasSwitches() override; + bool HasSwitch(const CefString& name) override; + CefString GetSwitchValue(const CefString& name) override; + void GetSwitches(SwitchMap& switches) override; + void AppendSwitch(const CefString& name) override; void AppendSwitchWithValue(const CefString& name, - const CefString& value) OVERRIDE; - bool HasArguments() OVERRIDE; - void GetArguments(ArgumentList& arguments) OVERRIDE; - void AppendArgument(const CefString& argument) OVERRIDE; - void PrependWrapper(const CefString& wrapper) OVERRIDE; + const CefString& value) override; + bool HasArguments() override; + void GetArguments(ArgumentList& arguments) override; + void AppendArgument(const CefString& argument) override; + void PrependWrapper(const CefString& wrapper) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_COMMAND_LINE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/context_menu_params_ctocpp.h b/libcef_dll/ctocpp/context_menu_params_ctocpp.h index 679150917..fb45f8eda 100644 --- a/libcef_dll/ctocpp/context_menu_params_ctocpp.h +++ b/libcef_dll/ctocpp/context_menu_params_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7de11c340a42046de92ca4cb8c5852269f3a3101$ +// $hash=5b36f9d1883cdf85a1a9167d058cbf9e2081b2b9$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_CONTEXT_MENU_PARAMS_CTOCPP_H_ @@ -36,26 +36,26 @@ class CefContextMenuParamsCToCpp virtual ~CefContextMenuParamsCToCpp(); // CefContextMenuParams methods. - int GetXCoord() OVERRIDE; - int GetYCoord() OVERRIDE; - TypeFlags GetTypeFlags() OVERRIDE; - CefString GetLinkUrl() OVERRIDE; - CefString GetUnfilteredLinkUrl() OVERRIDE; - CefString GetSourceUrl() OVERRIDE; - bool HasImageContents() OVERRIDE; - CefString GetTitleText() OVERRIDE; - CefString GetPageUrl() OVERRIDE; - CefString GetFrameUrl() OVERRIDE; - CefString GetFrameCharset() OVERRIDE; - MediaType GetMediaType() OVERRIDE; - MediaStateFlags GetMediaStateFlags() OVERRIDE; - CefString GetSelectionText() OVERRIDE; - CefString GetMisspelledWord() OVERRIDE; - bool GetDictionarySuggestions(std::vector& suggestions) OVERRIDE; - bool IsEditable() OVERRIDE; - bool IsSpellCheckEnabled() OVERRIDE; - EditStateFlags GetEditStateFlags() OVERRIDE; - bool IsCustomMenu() OVERRIDE; + int GetXCoord() override; + int GetYCoord() override; + TypeFlags GetTypeFlags() override; + CefString GetLinkUrl() override; + CefString GetUnfilteredLinkUrl() override; + CefString GetSourceUrl() override; + bool HasImageContents() override; + CefString GetTitleText() override; + CefString GetPageUrl() override; + CefString GetFrameUrl() override; + CefString GetFrameCharset() override; + MediaType GetMediaType() override; + MediaStateFlags GetMediaStateFlags() override; + CefString GetSelectionText() override; + CefString GetMisspelledWord() override; + bool GetDictionarySuggestions(std::vector& suggestions) override; + bool IsEditable() override; + bool IsSpellCheckEnabled() override; + EditStateFlags GetEditStateFlags() override; + bool IsCustomMenu() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_CONTEXT_MENU_PARAMS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/cookie_manager_ctocpp.h b/libcef_dll/ctocpp/cookie_manager_ctocpp.h index ce8e6def0..6377839a5 100644 --- a/libcef_dll/ctocpp/cookie_manager_ctocpp.h +++ b/libcef_dll/ctocpp/cookie_manager_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=86450b60ca929d794339574809c956ab0fec709e$ +// $hash=8781d6b33b836b66c5a7c4c55949738c579cd59d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_COOKIE_MANAGER_CTOCPP_H_ @@ -35,17 +35,17 @@ class CefCookieManagerCToCpp virtual ~CefCookieManagerCToCpp(); // CefCookieManager methods. - bool VisitAllCookies(CefRefPtr visitor) OVERRIDE; + bool VisitAllCookies(CefRefPtr visitor) override; bool VisitUrlCookies(const CefString& url, bool includeHttpOnly, - CefRefPtr visitor) OVERRIDE; + CefRefPtr visitor) override; bool SetCookie(const CefString& url, const CefCookie& cookie, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; bool DeleteCookies(const CefString& url, const CefString& cookie_name, - CefRefPtr callback) OVERRIDE; - bool FlushStore(CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; + bool FlushStore(CefRefPtr callback) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_COOKIE_MANAGER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/dictionary_value_ctocpp.h b/libcef_dll/ctocpp/dictionary_value_ctocpp.h index f72952a0b..f307b7c1e 100644 --- a/libcef_dll/ctocpp/dictionary_value_ctocpp.h +++ b/libcef_dll/ctocpp/dictionary_value_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=77a328d9997c59ff25bcd943be0d878432cdbfea$ +// $hash=e7dd0e7df0f2e46187c38a0b93b2a39a1ff70b1c$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DICTIONARY_VALUE_CTOCPP_H_ @@ -35,37 +35,37 @@ class CefDictionaryValueCToCpp virtual ~CefDictionaryValueCToCpp(); // CefDictionaryValue methods. - bool IsValid() OVERRIDE; - bool IsOwned() OVERRIDE; - bool IsReadOnly() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - bool IsEqual(CefRefPtr that) OVERRIDE; - CefRefPtr Copy(bool exclude_empty_children) OVERRIDE; - size_t GetSize() OVERRIDE; - bool Clear() OVERRIDE; - bool HasKey(const CefString& key) OVERRIDE; - bool GetKeys(KeyList& keys) OVERRIDE; - bool Remove(const CefString& key) OVERRIDE; - CefValueType GetType(const CefString& key) OVERRIDE; - CefRefPtr GetValue(const CefString& key) OVERRIDE; - bool GetBool(const CefString& key) OVERRIDE; - int GetInt(const CefString& key) OVERRIDE; - double GetDouble(const CefString& key) OVERRIDE; - CefString GetString(const CefString& key) OVERRIDE; - CefRefPtr GetBinary(const CefString& key) OVERRIDE; - CefRefPtr GetDictionary(const CefString& key) OVERRIDE; - CefRefPtr GetList(const CefString& key) OVERRIDE; - bool SetValue(const CefString& key, CefRefPtr value) OVERRIDE; - bool SetNull(const CefString& key) OVERRIDE; - bool SetBool(const CefString& key, bool value) OVERRIDE; - bool SetInt(const CefString& key, int value) OVERRIDE; - bool SetDouble(const CefString& key, double value) OVERRIDE; - bool SetString(const CefString& key, const CefString& value) OVERRIDE; + bool IsValid() override; + bool IsOwned() override; + bool IsReadOnly() override; + bool IsSame(CefRefPtr that) override; + bool IsEqual(CefRefPtr that) override; + CefRefPtr Copy(bool exclude_empty_children) override; + size_t GetSize() override; + bool Clear() override; + bool HasKey(const CefString& key) override; + bool GetKeys(KeyList& keys) override; + bool Remove(const CefString& key) override; + CefValueType GetType(const CefString& key) override; + CefRefPtr GetValue(const CefString& key) override; + bool GetBool(const CefString& key) override; + int GetInt(const CefString& key) override; + double GetDouble(const CefString& key) override; + CefString GetString(const CefString& key) override; + CefRefPtr GetBinary(const CefString& key) override; + CefRefPtr GetDictionary(const CefString& key) override; + CefRefPtr GetList(const CefString& key) override; + bool SetValue(const CefString& key, CefRefPtr value) override; + bool SetNull(const CefString& key) override; + bool SetBool(const CefString& key, bool value) override; + bool SetInt(const CefString& key, int value) override; + bool SetDouble(const CefString& key, double value) override; + bool SetString(const CefString& key, const CefString& value) override; bool SetBinary(const CefString& key, - CefRefPtr value) OVERRIDE; + CefRefPtr value) override; bool SetDictionary(const CefString& key, - CefRefPtr value) OVERRIDE; - bool SetList(const CefString& key, CefRefPtr value) OVERRIDE; + CefRefPtr value) override; + bool SetList(const CefString& key, CefRefPtr value) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_DICTIONARY_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/domdocument_ctocpp.h b/libcef_dll/ctocpp/domdocument_ctocpp.h index ec5d46c78..c770aab4c 100644 --- a/libcef_dll/ctocpp/domdocument_ctocpp.h +++ b/libcef_dll/ctocpp/domdocument_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=be5aeaffe84056cb5b1f032eaa8db30142b5916b$ +// $hash=65e0e380522652b9b6a24d2da247db99d52ca6a5$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOMDOCUMENT_CTOCPP_H_ @@ -34,20 +34,20 @@ class CefDOMDocumentCToCpp : public CefCToCppRefCounted GetDocument() OVERRIDE; - CefRefPtr GetBody() OVERRIDE; - CefRefPtr GetHead() OVERRIDE; - CefString GetTitle() OVERRIDE; - CefRefPtr GetElementById(const CefString& id) OVERRIDE; - CefRefPtr GetFocusedNode() OVERRIDE; - bool HasSelection() OVERRIDE; - int GetSelectionStartOffset() OVERRIDE; - int GetSelectionEndOffset() OVERRIDE; - CefString GetSelectionAsMarkup() OVERRIDE; - CefString GetSelectionAsText() OVERRIDE; - CefString GetBaseURL() OVERRIDE; - CefString GetCompleteURL(const CefString& partialURL) OVERRIDE; + Type GetType() override; + CefRefPtr GetDocument() override; + CefRefPtr GetBody() override; + CefRefPtr GetHead() override; + CefString GetTitle() override; + CefRefPtr GetElementById(const CefString& id) override; + CefRefPtr GetFocusedNode() override; + bool HasSelection() override; + int GetSelectionStartOffset() override; + int GetSelectionEndOffset() override; + CefString GetSelectionAsMarkup() override; + CefString GetSelectionAsText() override; + CefString GetBaseURL() override; + CefString GetCompleteURL(const CefString& partialURL) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_DOMDOCUMENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/domnode_ctocpp.h b/libcef_dll/ctocpp/domnode_ctocpp.h index 7fed8231b..8b5372bea 100644 --- a/libcef_dll/ctocpp/domnode_ctocpp.h +++ b/libcef_dll/ctocpp/domnode_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0261f2feb842f255f84c013f69076056e9710d98$ +// $hash=76e4928368797aa342ddaec6b62b59e8b4a42052$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOMNODE_CTOCPP_H_ @@ -33,33 +33,33 @@ class CefDOMNodeCToCpp virtual ~CefDOMNodeCToCpp(); // CefDOMNode methods. - Type GetType() OVERRIDE; - bool IsText() OVERRIDE; - bool IsElement() OVERRIDE; - bool IsEditable() OVERRIDE; - bool IsFormControlElement() OVERRIDE; - CefString GetFormControlElementType() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefString GetName() OVERRIDE; - CefString GetValue() OVERRIDE; - bool SetValue(const CefString& value) OVERRIDE; - CefString GetAsMarkup() OVERRIDE; - CefRefPtr GetDocument() OVERRIDE; - CefRefPtr GetParent() OVERRIDE; - CefRefPtr GetPreviousSibling() OVERRIDE; - CefRefPtr GetNextSibling() OVERRIDE; - bool HasChildren() OVERRIDE; - CefRefPtr GetFirstChild() OVERRIDE; - CefRefPtr GetLastChild() OVERRIDE; - CefString GetElementTagName() OVERRIDE; - bool HasElementAttributes() OVERRIDE; - bool HasElementAttribute(const CefString& attrName) OVERRIDE; - CefString GetElementAttribute(const CefString& attrName) OVERRIDE; - void GetElementAttributes(AttributeMap& attrMap) OVERRIDE; + Type GetType() override; + bool IsText() override; + bool IsElement() override; + bool IsEditable() override; + bool IsFormControlElement() override; + CefString GetFormControlElementType() override; + bool IsSame(CefRefPtr that) override; + CefString GetName() override; + CefString GetValue() override; + bool SetValue(const CefString& value) override; + CefString GetAsMarkup() override; + CefRefPtr GetDocument() override; + CefRefPtr GetParent() override; + CefRefPtr GetPreviousSibling() override; + CefRefPtr GetNextSibling() override; + bool HasChildren() override; + CefRefPtr GetFirstChild() override; + CefRefPtr GetLastChild() override; + CefString GetElementTagName() override; + bool HasElementAttributes() override; + bool HasElementAttribute(const CefString& attrName) override; + CefString GetElementAttribute(const CefString& attrName) override; + void GetElementAttributes(AttributeMap& attrMap) override; bool SetElementAttribute(const CefString& attrName, - const CefString& value) OVERRIDE; - CefString GetElementInnerText() OVERRIDE; - CefRect GetElementBounds() OVERRIDE; + const CefString& value) override; + CefString GetElementInnerText() override; + CefRect GetElementBounds() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_DOMNODE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_item_callback_ctocpp.h b/libcef_dll/ctocpp/download_item_callback_ctocpp.h index ccadf6a58..c9f4c22c4 100644 --- a/libcef_dll/ctocpp/download_item_callback_ctocpp.h +++ b/libcef_dll/ctocpp/download_item_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7f1556d32762b7eb0c65afbb7d4c5014a97a96c9$ +// $hash=c6b87f70eb695961c23c1fcff66c6d8e91663f6c$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_ITEM_CALLBACK_CTOCPP_H_ @@ -35,9 +35,9 @@ class CefDownloadItemCallbackCToCpp virtual ~CefDownloadItemCallbackCToCpp(); // CefDownloadItemCallback methods. - void Cancel() OVERRIDE; - void Pause() OVERRIDE; - void Resume() OVERRIDE; + void Cancel() override; + void Pause() override; + void Resume() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_ITEM_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_item_ctocpp.h b/libcef_dll/ctocpp/download_item_ctocpp.h index 1e1ed58eb..9384855bd 100644 --- a/libcef_dll/ctocpp/download_item_ctocpp.h +++ b/libcef_dll/ctocpp/download_item_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a536d8825fc85c5248fcdf5316bdf760e9f4a5e6$ +// $hash=ea3a9e840594e7dc8cd36f8b122d95c0050b9d25$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_ITEM_CTOCPP_H_ @@ -34,23 +34,23 @@ class CefDownloadItemCToCpp : public CefCToCppRefCounted Clone() OVERRIDE; - bool IsReadOnly() OVERRIDE; - bool IsLink() OVERRIDE; - bool IsFragment() OVERRIDE; - bool IsFile() OVERRIDE; - CefString GetLinkURL() OVERRIDE; - CefString GetLinkTitle() OVERRIDE; - CefString GetLinkMetadata() OVERRIDE; - CefString GetFragmentText() OVERRIDE; - CefString GetFragmentHtml() OVERRIDE; - CefString GetFragmentBaseURL() OVERRIDE; - CefString GetFileName() OVERRIDE; - size_t GetFileContents(CefRefPtr writer) OVERRIDE; - bool GetFileNames(std::vector& names) OVERRIDE; - void SetLinkURL(const CefString& url) OVERRIDE; - void SetLinkTitle(const CefString& title) OVERRIDE; - void SetLinkMetadata(const CefString& data) OVERRIDE; - void SetFragmentText(const CefString& text) OVERRIDE; - void SetFragmentHtml(const CefString& html) OVERRIDE; - void SetFragmentBaseURL(const CefString& base_url) OVERRIDE; - void ResetFileContents() OVERRIDE; - void AddFile(const CefString& path, const CefString& display_name) OVERRIDE; - CefRefPtr GetImage() OVERRIDE; - CefPoint GetImageHotspot() OVERRIDE; - bool HasImage() OVERRIDE; + CefRefPtr Clone() override; + bool IsReadOnly() override; + bool IsLink() override; + bool IsFragment() override; + bool IsFile() override; + CefString GetLinkURL() override; + CefString GetLinkTitle() override; + CefString GetLinkMetadata() override; + CefString GetFragmentText() override; + CefString GetFragmentHtml() override; + CefString GetFragmentBaseURL() override; + CefString GetFileName() override; + size_t GetFileContents(CefRefPtr writer) override; + bool GetFileNames(std::vector& names) override; + void SetLinkURL(const CefString& url) override; + void SetLinkTitle(const CefString& title) override; + void SetLinkMetadata(const CefString& data) override; + void SetFragmentText(const CefString& text) override; + void SetFragmentHtml(const CefString& html) override; + void SetFragmentBaseURL(const CefString& base_url) override; + void ResetFileContents() override; + void AddFile(const CefString& path, const CefString& display_name) override; + CefRefPtr GetImage() override; + CefPoint GetImageHotspot() override; + bool HasImage() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_DRAG_DATA_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/extension_ctocpp.h b/libcef_dll/ctocpp/extension_ctocpp.h index 578f87f03..1a2c5afa3 100644 --- a/libcef_dll/ctocpp/extension_ctocpp.h +++ b/libcef_dll/ctocpp/extension_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=faae935a841ecb55281ac5c8ff3621b2624c048f$ +// $hash=f22147c7417a396f35b486dc9a0df309cd3cf8b7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_EXTENSION_CTOCPP_H_ @@ -38,14 +38,14 @@ class CefExtensionCToCpp : public CefCToCppRefCounted GetManifest() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetHandler() OVERRIDE; - CefRefPtr GetLoaderContext() OVERRIDE; - bool IsLoaded() OVERRIDE; - void Unload() OVERRIDE; + CefString GetIdentifier() override; + CefString GetPath() override; + CefRefPtr GetManifest() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetHandler() override; + CefRefPtr GetLoaderContext() override; + bool IsLoaded() override; + void Unload() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_EXTENSION_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h index 1d66f25d5..64c9d5877 100644 --- a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=333ff5ff1b7dacb0ef4aa1f025d97babd4c2f252$ +// $hash=5eae6e5926edbbf4df1483890810048bd7883be4$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_FILE_DIALOG_CALLBACK_CTOCPP_H_ @@ -37,8 +37,8 @@ class CefFileDialogCallbackCToCpp // CefFileDialogCallback methods. void Continue(int selected_accept_filter, - const std::vector& file_paths) OVERRIDE; - void Cancel() OVERRIDE; + const std::vector& file_paths) override; + void Cancel() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_FILE_DIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/frame_ctocpp.h b/libcef_dll/ctocpp/frame_ctocpp.h index 5201b14a6..2bb073a5d 100644 --- a/libcef_dll/ctocpp/frame_ctocpp.h +++ b/libcef_dll/ctocpp/frame_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=398e1f63c0456dac74d288e3dc7a7b23e488b78a$ +// $hash=1e52bb7bf186d7368b281fd2d40d69894701895b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_ @@ -39,36 +39,36 @@ class CefFrameCToCpp virtual ~CefFrameCToCpp(); // CefFrame methods. - bool IsValid() OVERRIDE; - void Undo() OVERRIDE; - void Redo() OVERRIDE; - void Cut() OVERRIDE; - void Copy() OVERRIDE; - void Paste() OVERRIDE; - void Delete() OVERRIDE; - void SelectAll() OVERRIDE; - void ViewSource() OVERRIDE; - void GetSource(CefRefPtr visitor) OVERRIDE; - void GetText(CefRefPtr visitor) OVERRIDE; - void LoadRequest(CefRefPtr request) OVERRIDE; - void LoadURL(const CefString& url) OVERRIDE; + bool IsValid() override; + void Undo() override; + void Redo() override; + void Cut() override; + void Copy() override; + void Paste() override; + void Delete() override; + void SelectAll() override; + void ViewSource() override; + void GetSource(CefRefPtr visitor) override; + void GetText(CefRefPtr visitor) override; + void LoadRequest(CefRefPtr request) override; + void LoadURL(const CefString& url) override; void ExecuteJavaScript(const CefString& code, const CefString& script_url, - int start_line) OVERRIDE; - bool IsMain() OVERRIDE; - bool IsFocused() OVERRIDE; - CefString GetName() OVERRIDE; - int64 GetIdentifier() OVERRIDE; - CefRefPtr GetParent() OVERRIDE; - CefString GetURL() OVERRIDE; - CefRefPtr GetBrowser() OVERRIDE; - CefRefPtr GetV8Context() OVERRIDE; - void VisitDOM(CefRefPtr visitor) OVERRIDE; + int start_line) override; + bool IsMain() override; + bool IsFocused() override; + CefString GetName() override; + int64 GetIdentifier() override; + CefRefPtr GetParent() override; + CefString GetURL() override; + CefRefPtr GetBrowser() override; + CefRefPtr GetV8Context() override; + void VisitDOM(CefRefPtr visitor) override; CefRefPtr CreateURLRequest( CefRefPtr request, - CefRefPtr client) OVERRIDE; + CefRefPtr client) override; void SendProcessMessage(CefProcessId target_process, - CefRefPtr message) OVERRIDE; + CefRefPtr message) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h index b95acef38..280af0bee 100644 --- a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h +++ b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1e4ced3624db151e599c0928a7a87211d5dd8d57$ +// $hash=38df2c1411c040ada0d2ea23d1678767d237844d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_GET_EXTENSION_RESOURCE_CALLBACK_CTOCPP_H_ @@ -37,8 +37,8 @@ class CefGetExtensionResourceCallbackCToCpp virtual ~CefGetExtensionResourceCallbackCToCpp(); // CefGetExtensionResourceCallback methods. - void Continue(CefRefPtr stream) OVERRIDE; - void Cancel() OVERRIDE; + void Continue(CefRefPtr stream) override; + void Cancel() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_GET_EXTENSION_RESOURCE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/image_ctocpp.h b/libcef_dll/ctocpp/image_ctocpp.h index 699a1286e..abba5f9fc 100644 --- a/libcef_dll/ctocpp/image_ctocpp.h +++ b/libcef_dll/ctocpp/image_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=417397bf09d546377dfa4c067d5c569b0348abff$ +// $hash=33b5618b8b3ed610b91c92b33d0647639b6acd1b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_IMAGE_CTOCPP_H_ @@ -33,42 +33,42 @@ class CefImageCToCpp virtual ~CefImageCToCpp(); // CefImage methods. - bool IsEmpty() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; + bool IsEmpty() override; + bool IsSame(CefRefPtr that) override; bool AddBitmap(float scale_factor, int pixel_width, int pixel_height, cef_color_type_t color_type, cef_alpha_type_t alpha_type, const void* pixel_data, - size_t pixel_data_size) OVERRIDE; + size_t pixel_data_size) override; bool AddPNG(float scale_factor, const void* png_data, - size_t png_data_size) OVERRIDE; + size_t png_data_size) override; bool AddJPEG(float scale_factor, const void* jpeg_data, - size_t jpeg_data_size) OVERRIDE; - size_t GetWidth() OVERRIDE; - size_t GetHeight() OVERRIDE; - bool HasRepresentation(float scale_factor) OVERRIDE; - bool RemoveRepresentation(float scale_factor) OVERRIDE; + size_t jpeg_data_size) override; + size_t GetWidth() override; + size_t GetHeight() override; + bool HasRepresentation(float scale_factor) override; + bool RemoveRepresentation(float scale_factor) override; bool GetRepresentationInfo(float scale_factor, float& actual_scale_factor, int& pixel_width, - int& pixel_height) OVERRIDE; + int& pixel_height) override; CefRefPtr GetAsBitmap(float scale_factor, cef_color_type_t color_type, cef_alpha_type_t alpha_type, int& pixel_width, - int& pixel_height) OVERRIDE; + int& pixel_height) override; CefRefPtr GetAsPNG(float scale_factor, bool with_transparency, int& pixel_width, - int& pixel_height) OVERRIDE; + int& pixel_height) override; CefRefPtr GetAsJPEG(float scale_factor, int quality, int& pixel_width, - int& pixel_height) OVERRIDE; + int& pixel_height) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_IMAGE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h index bcce53f1d..15f8291c3 100644 --- a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=036ba78ec1797ee75002a5562fd0b0b97dff7392$ +// $hash=75100859481e72f7edaf81e712969eab01d34869$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_CALLBACK_CTOCPP_H_ @@ -35,7 +35,7 @@ class CefJSDialogCallbackCToCpp virtual ~CefJSDialogCallbackCToCpp(); // CefJSDialogCallback methods. - void Continue(bool success, const CefString& user_input) OVERRIDE; + void Continue(bool success, const CefString& user_input) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/list_value_ctocpp.h b/libcef_dll/ctocpp/list_value_ctocpp.h index e2d0e4fbe..0694b759b 100644 --- a/libcef_dll/ctocpp/list_value_ctocpp.h +++ b/libcef_dll/ctocpp/list_value_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=643127d0c9772dbab1980c797ceef47a12f00f48$ +// $hash=c73d2be6db899adb20faa9e1e6d6bf095f9ef2f0$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_LIST_VALUE_CTOCPP_H_ @@ -34,35 +34,35 @@ class CefListValueCToCpp : public CefCToCppRefCounted that) OVERRIDE; - bool IsEqual(CefRefPtr that) OVERRIDE; - CefRefPtr Copy() OVERRIDE; - bool SetSize(size_t size) OVERRIDE; - size_t GetSize() OVERRIDE; - bool Clear() OVERRIDE; - bool Remove(size_t index) OVERRIDE; - CefValueType GetType(size_t index) OVERRIDE; - CefRefPtr GetValue(size_t index) OVERRIDE; - bool GetBool(size_t index) OVERRIDE; - int GetInt(size_t index) OVERRIDE; - double GetDouble(size_t index) OVERRIDE; - CefString GetString(size_t index) OVERRIDE; - CefRefPtr GetBinary(size_t index) OVERRIDE; - CefRefPtr GetDictionary(size_t index) OVERRIDE; - CefRefPtr GetList(size_t index) OVERRIDE; - bool SetValue(size_t index, CefRefPtr value) OVERRIDE; - bool SetNull(size_t index) OVERRIDE; - bool SetBool(size_t index, bool value) OVERRIDE; - bool SetInt(size_t index, int value) OVERRIDE; - bool SetDouble(size_t index, double value) OVERRIDE; - bool SetString(size_t index, const CefString& value) OVERRIDE; - bool SetBinary(size_t index, CefRefPtr value) OVERRIDE; + bool IsValid() override; + bool IsOwned() override; + bool IsReadOnly() override; + bool IsSame(CefRefPtr that) override; + bool IsEqual(CefRefPtr that) override; + CefRefPtr Copy() override; + bool SetSize(size_t size) override; + size_t GetSize() override; + bool Clear() override; + bool Remove(size_t index) override; + CefValueType GetType(size_t index) override; + CefRefPtr GetValue(size_t index) override; + bool GetBool(size_t index) override; + int GetInt(size_t index) override; + double GetDouble(size_t index) override; + CefString GetString(size_t index) override; + CefRefPtr GetBinary(size_t index) override; + CefRefPtr GetDictionary(size_t index) override; + CefRefPtr GetList(size_t index) override; + bool SetValue(size_t index, CefRefPtr value) override; + bool SetNull(size_t index) override; + bool SetBool(size_t index, bool value) override; + bool SetInt(size_t index, int value) override; + bool SetDouble(size_t index, double value) override; + bool SetString(size_t index, const CefString& value) override; + bool SetBinary(size_t index, CefRefPtr value) override; bool SetDictionary(size_t index, - CefRefPtr value) OVERRIDE; - bool SetList(size_t index, CefRefPtr value) OVERRIDE; + CefRefPtr value) override; + bool SetList(size_t index, CefRefPtr value) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_LIST_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_route_ctocpp.h b/libcef_dll/ctocpp/media_route_ctocpp.h index 036d7fb9d..d887471d0 100644 --- a/libcef_dll/ctocpp/media_route_ctocpp.h +++ b/libcef_dll/ctocpp/media_route_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2332af38a85b938ce097ee671f957fa20622004e$ +// $hash=d09579b361d57b35a9e1a4db01fa783a08aa69af$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_ROUTE_CTOCPP_H_ @@ -34,11 +34,11 @@ class CefMediaRouteCToCpp : public CefCToCppRefCounted GetSource() OVERRIDE; - CefRefPtr GetSink() OVERRIDE; - void SendRouteMessage(const void* message, size_t message_size) OVERRIDE; - void Terminate() OVERRIDE; + CefString GetId() override; + CefRefPtr GetSource() override; + CefRefPtr GetSink() override; + void SendRouteMessage(const void* message, size_t message_size) override; + void Terminate() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_MEDIA_ROUTE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_router_ctocpp.h b/libcef_dll/ctocpp/media_router_ctocpp.h index c10562496..3d6e866b0 100644 --- a/libcef_dll/ctocpp/media_router_ctocpp.h +++ b/libcef_dll/ctocpp/media_router_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f17d39aa48d464eddc04143796492dd36563f773$ +// $hash=5c27e169e908799d879f108e14f7857a2a54d15e$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_ROUTER_CTOCPP_H_ @@ -35,13 +35,13 @@ class CefMediaRouterCToCpp : public CefCToCppRefCounted AddObserver( - CefRefPtr observer) OVERRIDE; - CefRefPtr GetSource(const CefString& urn) OVERRIDE; - void NotifyCurrentSinks() OVERRIDE; + CefRefPtr observer) override; + CefRefPtr GetSource(const CefString& urn) override; + void NotifyCurrentSinks() override; void CreateRoute(CefRefPtr source, CefRefPtr sink, - CefRefPtr callback) OVERRIDE; - void NotifyCurrentRoutes() OVERRIDE; + CefRefPtr callback) override; + void NotifyCurrentRoutes() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_MEDIA_ROUTER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_sink_ctocpp.h b/libcef_dll/ctocpp/media_sink_ctocpp.h index 909adabc6..ed39dc974 100644 --- a/libcef_dll/ctocpp/media_sink_ctocpp.h +++ b/libcef_dll/ctocpp/media_sink_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cd0189f46038a0f941bfd592127ce29866257b40$ +// $hash=8eaed0b915f9e9c2ec6b83705c05de88abfa4225$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_SINK_CTOCPP_H_ @@ -34,15 +34,15 @@ class CefMediaSinkCToCpp : public CefCToCppRefCounted callback) OVERRIDE; - bool IsCastSink() OVERRIDE; - bool IsDialSink() OVERRIDE; - bool IsCompatibleWith(CefRefPtr source) OVERRIDE; + CefRefPtr callback) override; + bool IsCastSink() override; + bool IsDialSink() override; + bool IsCompatibleWith(CefRefPtr source) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_MEDIA_SINK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_source_ctocpp.h b/libcef_dll/ctocpp/media_source_ctocpp.h index ee708064a..8751e0bbe 100644 --- a/libcef_dll/ctocpp/media_source_ctocpp.h +++ b/libcef_dll/ctocpp/media_source_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0f4a7c8d49d309dfcd2bbb739d0497c9e805678b$ +// $hash=004e00a9ab65a362343bd3df93bc6f32b6445611$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_SOURCE_CTOCPP_H_ @@ -34,9 +34,9 @@ class CefMediaSourceCToCpp : public CefCToCppRefCounted AddSubMenu(int command_id, - const CefString& label) OVERRIDE; - bool InsertSeparatorAt(int index) OVERRIDE; - bool InsertItemAt(int index, int command_id, const CefString& label) OVERRIDE; + const CefString& label) override; + bool InsertSeparatorAt(int index) override; + bool InsertItemAt(int index, int command_id, const CefString& label) override; bool InsertCheckItemAt(int index, int command_id, - const CefString& label) OVERRIDE; + const CefString& label) override; bool InsertRadioItemAt(int index, int command_id, const CefString& label, - int group_id) OVERRIDE; + int group_id) override; CefRefPtr InsertSubMenuAt(int index, int command_id, - const CefString& label) OVERRIDE; - bool Remove(int command_id) OVERRIDE; - bool RemoveAt(int index) OVERRIDE; - int GetIndexOf(int command_id) OVERRIDE; - int GetCommandIdAt(int index) OVERRIDE; - bool SetCommandIdAt(int index, int command_id) OVERRIDE; - CefString GetLabel(int command_id) OVERRIDE; - CefString GetLabelAt(int index) OVERRIDE; - bool SetLabel(int command_id, const CefString& label) OVERRIDE; - bool SetLabelAt(int index, const CefString& label) OVERRIDE; - MenuItemType GetType(int command_id) OVERRIDE; - MenuItemType GetTypeAt(int index) OVERRIDE; - int GetGroupId(int command_id) OVERRIDE; - int GetGroupIdAt(int index) OVERRIDE; - bool SetGroupId(int command_id, int group_id) OVERRIDE; - bool SetGroupIdAt(int index, int group_id) OVERRIDE; - CefRefPtr GetSubMenu(int command_id) OVERRIDE; - CefRefPtr GetSubMenuAt(int index) OVERRIDE; - bool IsVisible(int command_id) OVERRIDE; - bool IsVisibleAt(int index) OVERRIDE; - bool SetVisible(int command_id, bool visible) OVERRIDE; - bool SetVisibleAt(int index, bool visible) OVERRIDE; - bool IsEnabled(int command_id) OVERRIDE; - bool IsEnabledAt(int index) OVERRIDE; - bool SetEnabled(int command_id, bool enabled) OVERRIDE; - bool SetEnabledAt(int index, bool enabled) OVERRIDE; - bool IsChecked(int command_id) OVERRIDE; - bool IsCheckedAt(int index) OVERRIDE; - bool SetChecked(int command_id, bool checked) OVERRIDE; - bool SetCheckedAt(int index, bool checked) OVERRIDE; - bool HasAccelerator(int command_id) OVERRIDE; - bool HasAcceleratorAt(int index) OVERRIDE; + const CefString& label) override; + bool Remove(int command_id) override; + bool RemoveAt(int index) override; + int GetIndexOf(int command_id) override; + int GetCommandIdAt(int index) override; + bool SetCommandIdAt(int index, int command_id) override; + CefString GetLabel(int command_id) override; + CefString GetLabelAt(int index) override; + bool SetLabel(int command_id, const CefString& label) override; + bool SetLabelAt(int index, const CefString& label) override; + MenuItemType GetType(int command_id) override; + MenuItemType GetTypeAt(int index) override; + int GetGroupId(int command_id) override; + int GetGroupIdAt(int index) override; + bool SetGroupId(int command_id, int group_id) override; + bool SetGroupIdAt(int index, int group_id) override; + CefRefPtr GetSubMenu(int command_id) override; + CefRefPtr GetSubMenuAt(int index) override; + bool IsVisible(int command_id) override; + bool IsVisibleAt(int index) override; + bool SetVisible(int command_id, bool visible) override; + bool SetVisibleAt(int index, bool visible) override; + bool IsEnabled(int command_id) override; + bool IsEnabledAt(int index) override; + bool SetEnabled(int command_id, bool enabled) override; + bool SetEnabledAt(int index, bool enabled) override; + bool IsChecked(int command_id) override; + bool IsCheckedAt(int index) override; + bool SetChecked(int command_id, bool checked) override; + bool SetCheckedAt(int index, bool checked) override; + bool HasAccelerator(int command_id) override; + bool HasAcceleratorAt(int index) override; bool SetAccelerator(int command_id, int key_code, bool shift_pressed, bool ctrl_pressed, - bool alt_pressed) OVERRIDE; + bool alt_pressed) override; bool SetAcceleratorAt(int index, int key_code, bool shift_pressed, bool ctrl_pressed, - bool alt_pressed) OVERRIDE; - bool RemoveAccelerator(int command_id) OVERRIDE; - bool RemoveAcceleratorAt(int index) OVERRIDE; + bool alt_pressed) override; + bool RemoveAccelerator(int command_id) override; + bool RemoveAcceleratorAt(int index) override; bool GetAccelerator(int command_id, int& key_code, bool& shift_pressed, bool& ctrl_pressed, - bool& alt_pressed) OVERRIDE; + bool& alt_pressed) override; bool GetAcceleratorAt(int index, int& key_code, bool& shift_pressed, bool& ctrl_pressed, - bool& alt_pressed) OVERRIDE; + bool& alt_pressed) override; bool SetColor(int command_id, cef_menu_color_type_t color_type, - cef_color_t color) OVERRIDE; + cef_color_t color) override; bool SetColorAt(int index, cef_menu_color_type_t color_type, - cef_color_t color) OVERRIDE; + cef_color_t color) override; bool GetColor(int command_id, cef_menu_color_type_t color_type, - cef_color_t& color) OVERRIDE; + cef_color_t& color) override; bool GetColorAt(int index, cef_menu_color_type_t color_type, - cef_color_t& color) OVERRIDE; - bool SetFontList(int command_id, const CefString& font_list) OVERRIDE; - bool SetFontListAt(int index, const CefString& font_list) OVERRIDE; + cef_color_t& color) override; + bool SetFontList(int command_id, const CefString& font_list) override; + bool SetFontListAt(int index, const CefString& font_list) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_MENU_MODEL_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/navigation_entry_ctocpp.h b/libcef_dll/ctocpp/navigation_entry_ctocpp.h index 41d937da5..686e9c62a 100644 --- a/libcef_dll/ctocpp/navigation_entry_ctocpp.h +++ b/libcef_dll/ctocpp/navigation_entry_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=990d05c70f40b68b043cac0ad1e13f7004864bbe$ +// $hash=fee097f9fbb21c7c94a7286f0e3adf1ddc0f0a69$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_NAVIGATION_ENTRY_CTOCPP_H_ @@ -35,16 +35,16 @@ class CefNavigationEntryCToCpp virtual ~CefNavigationEntryCToCpp(); // CefNavigationEntry methods. - bool IsValid() OVERRIDE; - CefString GetURL() OVERRIDE; - CefString GetDisplayURL() OVERRIDE; - CefString GetOriginalURL() OVERRIDE; - CefString GetTitle() OVERRIDE; - TransitionType GetTransitionType() OVERRIDE; - bool HasPostData() OVERRIDE; - CefTime GetCompletionTime() OVERRIDE; - int GetHttpStatusCode() OVERRIDE; - CefRefPtr GetSSLStatus() OVERRIDE; + bool IsValid() override; + CefString GetURL() override; + CefString GetDisplayURL() override; + CefString GetOriginalURL() override; + CefString GetTitle() override; + TransitionType GetTransitionType() override; + bool HasPostData() override; + CefTime GetCompletionTime() override; + int GetHttpStatusCode() override; + CefRefPtr GetSSLStatus() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_NAVIGATION_ENTRY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/post_data_ctocpp.h b/libcef_dll/ctocpp/post_data_ctocpp.h index 8d7f1ae3a..cbaae2f29 100644 --- a/libcef_dll/ctocpp/post_data_ctocpp.h +++ b/libcef_dll/ctocpp/post_data_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4f27c0931e83f3f5b140eaeeffaf976dd751b1d2$ +// $hash=cfac126645b325004b278b70c2f305312346d6ae$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_POST_DATA_CTOCPP_H_ @@ -34,13 +34,13 @@ class CefPostDataCToCpp : public CefCToCppRefCounted element) OVERRIDE; - bool AddElement(CefRefPtr element) OVERRIDE; - void RemoveElements() OVERRIDE; + bool IsReadOnly() override; + bool HasExcludedElements() override; + size_t GetElementCount() override; + void GetElements(ElementVector& elements) override; + bool RemoveElement(CefRefPtr element) override; + bool AddElement(CefRefPtr element) override; + void RemoveElements() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_POST_DATA_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/post_data_element_ctocpp.h b/libcef_dll/ctocpp/post_data_element_ctocpp.h index 21d2ff886..d00af93aa 100644 --- a/libcef_dll/ctocpp/post_data_element_ctocpp.h +++ b/libcef_dll/ctocpp/post_data_element_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6ba7cc0530f7160b93a18d692512755b3fcb633b$ +// $hash=6eefcf95c6655b2d3eb81c506fd60b423876e254$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_POST_DATA_ELEMENT_CTOCPP_H_ @@ -35,14 +35,14 @@ class CefPostDataElementCToCpp virtual ~CefPostDataElementCToCpp(); // CefPostDataElement methods. - bool IsReadOnly() OVERRIDE; - void SetToEmpty() OVERRIDE; - void SetToFile(const CefString& fileName) OVERRIDE; - void SetToBytes(size_t size, const void* bytes) OVERRIDE; - Type GetType() OVERRIDE; - CefString GetFile() OVERRIDE; - size_t GetBytesCount() OVERRIDE; - size_t GetBytes(size_t size, void* bytes) OVERRIDE; + bool IsReadOnly() override; + void SetToEmpty() override; + void SetToFile(const CefString& fileName) override; + void SetToBytes(size_t size, const void* bytes) override; + Type GetType() override; + CefString GetFile() override; + size_t GetBytesCount() override; + size_t GetBytes(size_t size, void* bytes) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_POST_DATA_ELEMENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h index 20f3b6340..22517a46c 100644 --- a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=991c4e5902ba3fc4de818d4d124dccb10dfb5d52$ +// $hash=d1d4c09997abad1508d0815178a731f57c297320$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PRINT_DIALOG_CALLBACK_CTOCPP_H_ @@ -35,8 +35,8 @@ class CefPrintDialogCallbackCToCpp virtual ~CefPrintDialogCallbackCToCpp(); // CefPrintDialogCallback methods. - void Continue(CefRefPtr settings) OVERRIDE; - void Cancel() OVERRIDE; + void Continue(CefRefPtr settings) override; + void Cancel() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_PRINT_DIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_job_callback_ctocpp.h b/libcef_dll/ctocpp/print_job_callback_ctocpp.h index c21901780..a59601cac 100644 --- a/libcef_dll/ctocpp/print_job_callback_ctocpp.h +++ b/libcef_dll/ctocpp/print_job_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0c54d50effa8f690b879fd6ba0cdc1b3221c1cf5$ +// $hash=b4a040a4be651d7b8522b328d37b3baf78a67e58$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PRINT_JOB_CALLBACK_CTOCPP_H_ @@ -35,7 +35,7 @@ class CefPrintJobCallbackCToCpp virtual ~CefPrintJobCallbackCToCpp(); // CefPrintJobCallback methods. - void Continue() OVERRIDE; + void Continue() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_PRINT_JOB_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_settings_ctocpp.h b/libcef_dll/ctocpp/print_settings_ctocpp.h index 81f152aa8..294a0cc47 100644 --- a/libcef_dll/ctocpp/print_settings_ctocpp.h +++ b/libcef_dll/ctocpp/print_settings_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9e906ae27be45f6d7996a566cf6d43060dd87069$ +// $hash=599e0ac144ea555cf4eb8ec81651fb99c07dc0f1$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PRINT_SETTINGS_CTOCPP_H_ @@ -35,30 +35,30 @@ class CefPrintSettingsCToCpp virtual ~CefPrintSettingsCToCpp(); // CefPrintSettings methods. - bool IsValid() OVERRIDE; - bool IsReadOnly() OVERRIDE; - void SetOrientation(bool landscape) OVERRIDE; - bool IsLandscape() OVERRIDE; + bool IsValid() override; + bool IsReadOnly() override; + void SetOrientation(bool landscape) override; + bool IsLandscape() override; void SetPrinterPrintableArea(const CefSize& physical_size_device_units, const CefRect& printable_area_device_units, - bool landscape_needs_flip) OVERRIDE; - void SetDeviceName(const CefString& name) OVERRIDE; - CefString GetDeviceName() OVERRIDE; - void SetDPI(int dpi) OVERRIDE; - int GetDPI() OVERRIDE; - void SetPageRanges(const PageRangeList& ranges) OVERRIDE; - size_t GetPageRangesCount() OVERRIDE; - void GetPageRanges(PageRangeList& ranges) OVERRIDE; - void SetSelectionOnly(bool selection_only) OVERRIDE; - bool IsSelectionOnly() OVERRIDE; - void SetCollate(bool collate) OVERRIDE; - bool WillCollate() OVERRIDE; - void SetColorModel(ColorModel model) OVERRIDE; - ColorModel GetColorModel() OVERRIDE; - void SetCopies(int copies) OVERRIDE; - int GetCopies() OVERRIDE; - void SetDuplexMode(DuplexMode mode) OVERRIDE; - DuplexMode GetDuplexMode() OVERRIDE; + bool landscape_needs_flip) override; + void SetDeviceName(const CefString& name) override; + CefString GetDeviceName() override; + void SetDPI(int dpi) override; + int GetDPI() override; + void SetPageRanges(const PageRangeList& ranges) override; + size_t GetPageRangesCount() override; + void GetPageRanges(PageRangeList& ranges) override; + void SetSelectionOnly(bool selection_only) override; + bool IsSelectionOnly() override; + void SetCollate(bool collate) override; + bool WillCollate() override; + void SetColorModel(ColorModel model) override; + ColorModel GetColorModel() override; + void SetCopies(int copies) override; + int GetCopies() override; + void SetDuplexMode(DuplexMode mode) override; + DuplexMode GetDuplexMode() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_PRINT_SETTINGS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/process_message_ctocpp.h b/libcef_dll/ctocpp/process_message_ctocpp.h index b0d50061c..408769c5f 100644 --- a/libcef_dll/ctocpp/process_message_ctocpp.h +++ b/libcef_dll/ctocpp/process_message_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c6de5a60b4d438f164b9915b9adc1e1c319c0f53$ +// $hash=590ed9ad60ffd03c62591b1dcae2d1c4d7603846$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PROCESS_MESSAGE_CTOCPP_H_ @@ -35,11 +35,11 @@ class CefProcessMessageCToCpp virtual ~CefProcessMessageCToCpp(); // CefProcessMessage methods. - bool IsValid() OVERRIDE; - bool IsReadOnly() OVERRIDE; - CefRefPtr Copy() OVERRIDE; - CefString GetName() OVERRIDE; - CefRefPtr GetArgumentList() OVERRIDE; + bool IsValid() override; + bool IsReadOnly() override; + CefRefPtr Copy() override; + CefString GetName() override; + CefRefPtr GetArgumentList() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_PROCESS_MESSAGE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_callback_ctocpp.h b/libcef_dll/ctocpp/request_callback_ctocpp.h index 766653035..eca5666d7 100644 --- a/libcef_dll/ctocpp/request_callback_ctocpp.h +++ b/libcef_dll/ctocpp/request_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1ede257dfc48418e456f733bff7a062e8b841efe$ +// $hash=49871b71a226d36c9c60ac06c2a242c106766d34$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_REQUEST_CALLBACK_CTOCPP_H_ @@ -35,8 +35,8 @@ class CefRequestCallbackCToCpp virtual ~CefRequestCallbackCToCpp(); // CefRequestCallback methods. - void Continue(bool allow) OVERRIDE; - void Cancel() OVERRIDE; + void Continue(bool allow) override; + void Cancel() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_context_ctocpp.h b/libcef_dll/ctocpp/request_context_ctocpp.h index 314110af2..50814323e 100644 --- a/libcef_dll/ctocpp/request_context_ctocpp.h +++ b/libcef_dll/ctocpp/request_context_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0aff81f2ccc5881001e9fd61cc6e349253fb2ac5$ +// $hash=3e68482578ce8edfa73bef03a7f943194f3b7f34$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_REQUEST_CONTEXT_CTOCPP_H_ @@ -40,43 +40,43 @@ class CefRequestContextCToCpp virtual ~CefRequestContextCToCpp(); // CefRequestContext methods. - bool IsSame(CefRefPtr other) OVERRIDE; - bool IsSharingWith(CefRefPtr other) OVERRIDE; - bool IsGlobal() OVERRIDE; - CefRefPtr GetHandler() OVERRIDE; - CefString GetCachePath() OVERRIDE; + bool IsSame(CefRefPtr other) override; + bool IsSharingWith(CefRefPtr other) override; + bool IsGlobal() override; + CefRefPtr GetHandler() override; + CefString GetCachePath() override; CefRefPtr GetCookieManager( - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; bool RegisterSchemeHandlerFactory( const CefString& scheme_name, const CefString& domain_name, - CefRefPtr factory) OVERRIDE; - bool ClearSchemeHandlerFactories() OVERRIDE; - void PurgePluginListCache(bool reload_pages) OVERRIDE; - bool HasPreference(const CefString& name) OVERRIDE; - CefRefPtr GetPreference(const CefString& name) OVERRIDE; + CefRefPtr factory) override; + bool ClearSchemeHandlerFactories() override; + void PurgePluginListCache(bool reload_pages) override; + bool HasPreference(const CefString& name) override; + CefRefPtr GetPreference(const CefString& name) override; CefRefPtr GetAllPreferences( - bool include_defaults) OVERRIDE; - bool CanSetPreference(const CefString& name) OVERRIDE; + bool include_defaults) override; + bool CanSetPreference(const CefString& name) override; bool SetPreference(const CefString& name, CefRefPtr value, - CefString& error) OVERRIDE; + CefString& error) override; void ClearCertificateExceptions( - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; void ClearHttpAuthCredentials( - CefRefPtr callback) OVERRIDE; - void CloseAllConnections(CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; + void CloseAllConnections(CefRefPtr callback) override; void ResolveHost(const CefString& origin, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; void LoadExtension(const CefString& root_directory, CefRefPtr manifest, - CefRefPtr handler) OVERRIDE; - bool DidLoadExtension(const CefString& extension_id) OVERRIDE; - bool HasExtension(const CefString& extension_id) OVERRIDE; - bool GetExtensions(std::vector& extension_ids) OVERRIDE; - CefRefPtr GetExtension(const CefString& extension_id) OVERRIDE; + CefRefPtr handler) override; + bool DidLoadExtension(const CefString& extension_id) override; + bool HasExtension(const CefString& extension_id) override; + bool GetExtensions(std::vector& extension_ids) override; + CefRefPtr GetExtension(const CefString& extension_id) override; CefRefPtr GetMediaRouter( - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_CONTEXT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_ctocpp.h b/libcef_dll/ctocpp/request_ctocpp.h index a53848cb4..a65fdf98c 100644 --- a/libcef_dll/ctocpp/request_ctocpp.h +++ b/libcef_dll/ctocpp/request_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=77fee821efba296de9f9c01aa42f77596fb381d1$ +// $hash=c4051f19be6db04a41ea69d0ee95286ac5b85d20$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_REQUEST_CTOCPP_H_ @@ -33,34 +33,34 @@ class CefRequestCToCpp virtual ~CefRequestCToCpp(); // CefRequest methods. - bool IsReadOnly() OVERRIDE; - CefString GetURL() OVERRIDE; - void SetURL(const CefString& url) OVERRIDE; - CefString GetMethod() OVERRIDE; - void SetMethod(const CefString& method) OVERRIDE; + bool IsReadOnly() override; + CefString GetURL() override; + void SetURL(const CefString& url) override; + CefString GetMethod() override; + void SetMethod(const CefString& method) override; void SetReferrer(const CefString& referrer_url, - ReferrerPolicy policy) OVERRIDE; - CefString GetReferrerURL() OVERRIDE; - ReferrerPolicy GetReferrerPolicy() OVERRIDE; - CefRefPtr GetPostData() OVERRIDE; - void SetPostData(CefRefPtr postData) OVERRIDE; - void GetHeaderMap(HeaderMap& headerMap) OVERRIDE; - void SetHeaderMap(const HeaderMap& headerMap) OVERRIDE; - CefString GetHeaderByName(const CefString& name) OVERRIDE; + ReferrerPolicy policy) override; + CefString GetReferrerURL() override; + ReferrerPolicy GetReferrerPolicy() override; + CefRefPtr GetPostData() override; + void SetPostData(CefRefPtr postData) override; + void GetHeaderMap(HeaderMap& headerMap) override; + void SetHeaderMap(const HeaderMap& headerMap) override; + CefString GetHeaderByName(const CefString& name) override; void SetHeaderByName(const CefString& name, const CefString& value, - bool overwrite) OVERRIDE; + bool overwrite) override; void Set(const CefString& url, const CefString& method, CefRefPtr postData, - const HeaderMap& headerMap) OVERRIDE; - int GetFlags() OVERRIDE; - void SetFlags(int flags) OVERRIDE; - CefString GetFirstPartyForCookies() OVERRIDE; - void SetFirstPartyForCookies(const CefString& url) OVERRIDE; - ResourceType GetResourceType() OVERRIDE; - TransitionType GetTransitionType() OVERRIDE; - uint64 GetIdentifier() OVERRIDE; + const HeaderMap& headerMap) override; + int GetFlags() override; + void SetFlags(int flags) override; + CefString GetFirstPartyForCookies() override; + void SetFirstPartyForCookies(const CefString& url) override; + ResourceType GetResourceType() override; + TransitionType GetTransitionType() override; + uint64 GetIdentifier() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_bundle_ctocpp.h b/libcef_dll/ctocpp/resource_bundle_ctocpp.h index 072ad8594..9b95884b8 100644 --- a/libcef_dll/ctocpp/resource_bundle_ctocpp.h +++ b/libcef_dll/ctocpp/resource_bundle_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=00c386274cefb6ae461544f93cea6df7d2a6f367$ +// $hash=69743695174bd4a3b85f3afc0b5ba9f0d4460e2f$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOURCE_BUNDLE_CTOCPP_H_ @@ -35,11 +35,11 @@ class CefResourceBundleCToCpp virtual ~CefResourceBundleCToCpp(); // CefResourceBundle methods. - CefString GetLocalizedString(int string_id) OVERRIDE; - CefRefPtr GetDataResource(int resource_id) OVERRIDE; + CefString GetLocalizedString(int string_id) override; + CefRefPtr GetDataResource(int resource_id) override; CefRefPtr GetDataResourceForScale( int resource_id, - ScaleFactor scale_factor) OVERRIDE; + ScaleFactor scale_factor) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_RESOURCE_BUNDLE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_read_callback_ctocpp.h b/libcef_dll/ctocpp/resource_read_callback_ctocpp.h index f1115e774..8ee3476a5 100644 --- a/libcef_dll/ctocpp/resource_read_callback_ctocpp.h +++ b/libcef_dll/ctocpp/resource_read_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1678dd45fdeac3cf3f0674138791fa2eb51f08e2$ +// $hash=27ca93319fbbdc4a10ee8ff6643c710df5f00b30$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOURCE_READ_CALLBACK_CTOCPP_H_ @@ -35,7 +35,7 @@ class CefResourceReadCallbackCToCpp virtual ~CefResourceReadCallbackCToCpp(); // CefResourceReadCallback methods. - void Continue(int bytes_read) OVERRIDE; + void Continue(int bytes_read) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_RESOURCE_READ_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_skip_callback_ctocpp.h b/libcef_dll/ctocpp/resource_skip_callback_ctocpp.h index 0e90c6fa0..364ba6f06 100644 --- a/libcef_dll/ctocpp/resource_skip_callback_ctocpp.h +++ b/libcef_dll/ctocpp/resource_skip_callback_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e5f6f5e49687972c21461aa8055a17aa73d9f5dc$ +// $hash=a42a14c436bb2c32de18d7c5b9a1e3a5b76db0b3$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOURCE_SKIP_CALLBACK_CTOCPP_H_ @@ -35,7 +35,7 @@ class CefResourceSkipCallbackCToCpp virtual ~CefResourceSkipCallbackCToCpp(); // CefResourceSkipCallback methods. - void Continue(int64 bytes_skipped) OVERRIDE; + void Continue(int64 bytes_skipped) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_RESOURCE_SKIP_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/response_ctocpp.h b/libcef_dll/ctocpp/response_ctocpp.h index a1b1a5dcb..affc71571 100644 --- a/libcef_dll/ctocpp/response_ctocpp.h +++ b/libcef_dll/ctocpp/response_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=82ca98c4f8fbbac643f826f882ae4e4efe80e821$ +// $hash=cd564f3f21d61a5ce0e3ee3b0dbf8b192b860a30$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESPONSE_CTOCPP_H_ @@ -34,25 +34,25 @@ class CefResponseCToCpp : public CefCToCppRefCounted cert) OVERRIDE; + void Select(CefRefPtr cert) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_SELECT_CLIENT_CERTIFICATE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/server_ctocpp.h b/libcef_dll/ctocpp/server_ctocpp.h index 1f92857cb..26c7c64e4 100644 --- a/libcef_dll/ctocpp/server_ctocpp.h +++ b/libcef_dll/ctocpp/server_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0e1ecc65bf21127a32292fe7e84378bacbf649ed$ +// $hash=4db8632a3ac7ba81921e32dd92f5c81e30b4c959$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SERVER_CTOCPP_H_ @@ -33,31 +33,31 @@ class CefServerCToCpp virtual ~CefServerCToCpp(); // CefServer methods. - CefRefPtr GetTaskRunner() OVERRIDE; - void Shutdown() OVERRIDE; - bool IsRunning() OVERRIDE; - CefString GetAddress() OVERRIDE; - bool HasConnection() OVERRIDE; - bool IsValidConnection(int connection_id) OVERRIDE; + CefRefPtr GetTaskRunner() override; + void Shutdown() override; + bool IsRunning() override; + CefString GetAddress() override; + bool HasConnection() override; + bool IsValidConnection(int connection_id) override; void SendHttp200Response(int connection_id, const CefString& content_type, const void* data, - size_t data_size) OVERRIDE; - void SendHttp404Response(int connection_id) OVERRIDE; + size_t data_size) override; + void SendHttp404Response(int connection_id) override; void SendHttp500Response(int connection_id, - const CefString& error_message) OVERRIDE; + const CefString& error_message) override; void SendHttpResponse(int connection_id, int response_code, const CefString& content_type, int64 content_length, - const HeaderMap& extra_headers) OVERRIDE; + const HeaderMap& extra_headers) override; void SendRawData(int connection_id, const void* data, - size_t data_size) OVERRIDE; - void CloseConnection(int connection_id) OVERRIDE; + size_t data_size) override; + void CloseConnection(int connection_id) override; void SendWebSocketMessage(int connection_id, const void* data, - size_t data_size) OVERRIDE; + size_t data_size) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_SERVER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/sslinfo_ctocpp.h b/libcef_dll/ctocpp/sslinfo_ctocpp.h index f3326b17f..08da39274 100644 --- a/libcef_dll/ctocpp/sslinfo_ctocpp.h +++ b/libcef_dll/ctocpp/sslinfo_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ce3dfac0c94806a0e33ba0783482c3c3f2dada1c$ +// $hash=390ce86c2295d2714c06379183d4d3ef458dba77$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SSLINFO_CTOCPP_H_ @@ -33,8 +33,8 @@ class CefSSLInfoCToCpp virtual ~CefSSLInfoCToCpp(); // CefSSLInfo methods. - cef_cert_status_t GetCertStatus() OVERRIDE; - CefRefPtr GetX509Certificate() OVERRIDE; + cef_cert_status_t GetCertStatus() override; + CefRefPtr GetX509Certificate() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_SSLINFO_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/sslstatus_ctocpp.h b/libcef_dll/ctocpp/sslstatus_ctocpp.h index 246fb8c0f..621eb9dc6 100644 --- a/libcef_dll/ctocpp/sslstatus_ctocpp.h +++ b/libcef_dll/ctocpp/sslstatus_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a3876890dd91d430af51c1f0ce639e8449453bc3$ +// $hash=4455818cc5cea47d69ccc7656f04aa39c9fc60e5$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SSLSTATUS_CTOCPP_H_ @@ -34,11 +34,11 @@ class CefSSLStatusCToCpp : public CefCToCppRefCounted GetX509Certificate() OVERRIDE; + bool IsSecureConnection() override; + cef_cert_status_t GetCertStatus() override; + cef_ssl_version_t GetSSLVersion() override; + cef_ssl_content_status_t GetContentStatus() override; + CefRefPtr GetX509Certificate() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_SSLSTATUS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/stream_reader_ctocpp.h b/libcef_dll/ctocpp/stream_reader_ctocpp.h index cb25318df..ed8325b38 100644 --- a/libcef_dll/ctocpp/stream_reader_ctocpp.h +++ b/libcef_dll/ctocpp/stream_reader_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9e52f14c3559e2cc88c422105b9cea12a5be65b9$ +// $hash=47cc685d94d5bdf4f4925d1332668244198f2ff1$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_STREAM_READER_CTOCPP_H_ @@ -34,11 +34,11 @@ class CefStreamReaderCToCpp : public CefCToCppRefCounted that) OVERRIDE; - bool BelongsToCurrentThread() OVERRIDE; - bool BelongsToThread(CefThreadId threadId) OVERRIDE; - bool PostTask(CefRefPtr task) OVERRIDE; - bool PostDelayedTask(CefRefPtr task, int64 delay_ms) OVERRIDE; + bool IsSame(CefRefPtr that) override; + bool BelongsToCurrentThread() override; + bool BelongsToThread(CefThreadId threadId) override; + bool PostTask(CefRefPtr task) override; + bool PostDelayedTask(CefRefPtr task, int64 delay_ms) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_TASK_RUNNER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ctocpp.h index 9a2ff9e3f..7fbe208bf 100644 --- a/libcef_dll/ctocpp/test/translator_test_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=db05a06c80f30f0d25b2eec12b50bbf0310e36fb$ +// $hash=8c8f88e63e66da894c41c1aa5de7eb6af7b3abd8$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_CTOCPP_H_ @@ -37,100 +37,100 @@ class CefTranslatorTestCToCpp virtual ~CefTranslatorTestCToCpp(); // CefTranslatorTest methods. - void GetVoid() OVERRIDE; - bool GetBool() OVERRIDE; - int GetInt() OVERRIDE; - double GetDouble() OVERRIDE; - long GetLong() OVERRIDE; - size_t GetSizet() OVERRIDE; - bool SetVoid() OVERRIDE; - bool SetBool(bool val) OVERRIDE; - bool SetInt(int val) OVERRIDE; - bool SetDouble(double val) OVERRIDE; - bool SetLong(long val) OVERRIDE; - bool SetSizet(size_t val) OVERRIDE; - bool SetIntList(const std::vector& val) OVERRIDE; - bool GetIntListByRef(IntList& val) OVERRIDE; - size_t GetIntListSize() OVERRIDE; - CefString GetString() OVERRIDE; - bool SetString(const CefString& val) OVERRIDE; - void GetStringByRef(CefString& val) OVERRIDE; - bool SetStringList(const std::vector& val) OVERRIDE; - bool GetStringListByRef(StringList& val) OVERRIDE; - bool SetStringMap(const StringMap& val) OVERRIDE; - bool GetStringMapByRef(std::map& val) OVERRIDE; + void GetVoid() override; + bool GetBool() override; + int GetInt() override; + double GetDouble() override; + long GetLong() override; + size_t GetSizet() override; + bool SetVoid() override; + bool SetBool(bool val) override; + bool SetInt(int val) override; + bool SetDouble(double val) override; + bool SetLong(long val) override; + bool SetSizet(size_t val) override; + bool SetIntList(const std::vector& val) override; + bool GetIntListByRef(IntList& val) override; + size_t GetIntListSize() override; + CefString GetString() override; + bool SetString(const CefString& val) override; + void GetStringByRef(CefString& val) override; + bool SetStringList(const std::vector& val) override; + bool GetStringListByRef(StringList& val) override; + bool SetStringMap(const StringMap& val) override; + bool GetStringMapByRef(std::map& val) override; bool SetStringMultimap( - const std::multimap& val) OVERRIDE; - bool GetStringMultimapByRef(StringMultimap& val) OVERRIDE; - CefPoint GetPoint() OVERRIDE; - bool SetPoint(const CefPoint& val) OVERRIDE; - void GetPointByRef(CefPoint& val) OVERRIDE; - bool SetPointList(const std::vector& val) OVERRIDE; - bool GetPointListByRef(PointList& val) OVERRIDE; - size_t GetPointListSize() OVERRIDE; - CefRefPtr GetRefPtrLibrary(int val) OVERRIDE; - int SetRefPtrLibrary(CefRefPtr val) OVERRIDE; + const std::multimap& val) override; + bool GetStringMultimapByRef(StringMultimap& val) override; + CefPoint GetPoint() override; + bool SetPoint(const CefPoint& val) override; + void GetPointByRef(CefPoint& val) override; + bool SetPointList(const std::vector& val) override; + bool GetPointListByRef(PointList& val) override; + size_t GetPointListSize() override; + CefRefPtr GetRefPtrLibrary(int val) override; + int SetRefPtrLibrary(CefRefPtr val) override; CefRefPtr SetRefPtrLibraryAndReturn( - CefRefPtr val) OVERRIDE; + CefRefPtr val) override; int SetChildRefPtrLibrary( - CefRefPtr val) OVERRIDE; + CefRefPtr val) override; CefRefPtr SetChildRefPtrLibraryAndReturnParent( - CefRefPtr val) OVERRIDE; + CefRefPtr val) override; bool SetRefPtrLibraryList( const std::vector>& val, int val1, - int val2) OVERRIDE; + int val2) override; bool GetRefPtrLibraryListByRef(RefPtrLibraryList& val, int val1, - int val2) OVERRIDE; - size_t GetRefPtrLibraryListSize() OVERRIDE; - int SetRefPtrClient(CefRefPtr val) OVERRIDE; + int val2) override; + size_t GetRefPtrLibraryListSize() override; + int SetRefPtrClient(CefRefPtr val) override; CefRefPtr SetRefPtrClientAndReturn( - CefRefPtr val) OVERRIDE; + CefRefPtr val) override; int SetChildRefPtrClient( - CefRefPtr val) OVERRIDE; + CefRefPtr val) override; CefRefPtr SetChildRefPtrClientAndReturnParent( - CefRefPtr val) OVERRIDE; + CefRefPtr val) override; bool SetRefPtrClientList( const std::vector>& val, int val1, - int val2) OVERRIDE; + int val2) override; bool GetRefPtrClientListByRef( RefPtrClientList& val, CefRefPtr val1, - CefRefPtr val2) OVERRIDE; - size_t GetRefPtrClientListSize() OVERRIDE; - CefOwnPtr GetOwnPtrLibrary(int val) OVERRIDE; - int SetOwnPtrLibrary(CefOwnPtr val) OVERRIDE; + CefRefPtr val2) override; + size_t GetRefPtrClientListSize() override; + CefOwnPtr GetOwnPtrLibrary(int val) override; + int SetOwnPtrLibrary(CefOwnPtr val) override; CefOwnPtr SetOwnPtrLibraryAndReturn( - CefOwnPtr val) OVERRIDE; + CefOwnPtr val) override; int SetChildOwnPtrLibrary( - CefOwnPtr val) OVERRIDE; + CefOwnPtr val) override; CefOwnPtr SetChildOwnPtrLibraryAndReturnParent( - CefOwnPtr val) OVERRIDE; - int SetOwnPtrClient(CefOwnPtr val) OVERRIDE; + CefOwnPtr val) override; + int SetOwnPtrClient(CefOwnPtr val) override; CefOwnPtr SetOwnPtrClientAndReturn( - CefOwnPtr val) OVERRIDE; + CefOwnPtr val) override; int SetChildOwnPtrClient( - CefOwnPtr val) OVERRIDE; + CefOwnPtr val) override; CefOwnPtr SetChildOwnPtrClientAndReturnParent( - CefOwnPtr val) OVERRIDE; - int SetRawPtrLibrary(CefRawPtr val) OVERRIDE; + CefOwnPtr val) override; + int SetRawPtrLibrary(CefRawPtr val) override; int SetChildRawPtrLibrary( - CefRawPtr val) OVERRIDE; + CefRawPtr val) override; bool SetRawPtrLibraryList( const std::vector>& val, int val1, - int val2) OVERRIDE; - int SetRawPtrClient(CefRawPtr val) OVERRIDE; + int val2) override; + int SetRawPtrClient(CefRawPtr val) override; int SetChildRawPtrClient( - CefRawPtr val) OVERRIDE; + CefRawPtr val) override; bool SetRawPtrClientList( const std::vector>& val, int val1, - int val2) OVERRIDE; + int val2) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h index 359949740..f8e161551 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6a66e2e38975072adf919a3b585ce94b254a7639$ +// $hash=a19601577d6fbbb47df32d544cbfe72f1691447f$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD_CTOCPP_H_ @@ -36,16 +36,16 @@ class CefTranslatorTestRefPtrLibraryChildChildCToCpp virtual ~CefTranslatorTestRefPtrLibraryChildChildCToCpp(); // CefTranslatorTestRefPtrLibraryChildChild methods. - int GetOtherOtherValue() OVERRIDE; - void SetOtherOtherValue(int value) OVERRIDE; + int GetOtherOtherValue() override; + void SetOtherOtherValue(int value) override; // CefTranslatorTestRefPtrLibraryChild methods. - int GetOtherValue() OVERRIDE; - void SetOtherValue(int value) OVERRIDE; + int GetOtherValue() override; + void SetOtherValue(int value) override; // CefTranslatorTestRefPtrLibrary methods. - int GetValue() OVERRIDE; - void SetValue(int value) OVERRIDE; + int GetValue() override; + void SetValue(int value) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h index 4e44691bc..2f48fe4f9 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0d111f8f1933fc569fa28128a85c269fb6b0e173$ +// $hash=b4d01a3573b935bd11ccc6228eda8a4360866a44$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CTOCPP_H_ @@ -35,12 +35,12 @@ class CefTranslatorTestRefPtrLibraryChildCToCpp virtual ~CefTranslatorTestRefPtrLibraryChildCToCpp(); // CefTranslatorTestRefPtrLibraryChild methods. - int GetOtherValue() OVERRIDE; - void SetOtherValue(int value) OVERRIDE; + int GetOtherValue() override; + void SetOtherValue(int value) override; // CefTranslatorTestRefPtrLibrary methods. - int GetValue() OVERRIDE; - void SetValue(int value) OVERRIDE; + int GetValue() override; + void SetValue(int value) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h index 28d51db42..c3823704a 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=abede61a749b1cbb1f546918c32601cb707a6ed7$ +// $hash=7a3c15a7c8e1ddda031365bffdfb723af307e5a4$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CTOCPP_H_ @@ -35,8 +35,8 @@ class CefTranslatorTestRefPtrLibraryCToCpp virtual ~CefTranslatorTestRefPtrLibraryCToCpp(); // CefTranslatorTestRefPtrLibrary methods. - int GetValue() OVERRIDE; - void SetValue(int value) OVERRIDE; + int GetValue() override; + void SetValue(int value) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h index a8215a9fe..3ed9fcc03 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3cbadd1fe76cfdd2cdc69bf74ef5cecded4678a0$ +// $hash=d3c6963c651d5172268af9f927b3834e4e96b44f$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD_CTOCPP_H_ @@ -35,16 +35,16 @@ class CefTranslatorTestScopedLibraryChildChildCToCpp virtual ~CefTranslatorTestScopedLibraryChildChildCToCpp(); // CefTranslatorTestScopedLibraryChildChild methods. - int GetOtherOtherValue() OVERRIDE; - void SetOtherOtherValue(int value) OVERRIDE; + int GetOtherOtherValue() override; + void SetOtherOtherValue(int value) override; // CefTranslatorTestScopedLibraryChild methods. - int GetOtherValue() OVERRIDE; - void SetOtherValue(int value) OVERRIDE; + int GetOtherValue() override; + void SetOtherValue(int value) override; // CefTranslatorTestScopedLibrary methods. - int GetValue() OVERRIDE; - void SetValue(int value) OVERRIDE; + int GetValue() override; + void SetValue(int value) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h index 52cd06e15..1c2916b1b 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f7643df00ccbcefbbca15979c07763502de4af2e$ +// $hash=d69bc43df1d16fe114cf61bb87ea8e0a1ff343ef$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CTOCPP_H_ @@ -35,12 +35,12 @@ class CefTranslatorTestScopedLibraryChildCToCpp virtual ~CefTranslatorTestScopedLibraryChildCToCpp(); // CefTranslatorTestScopedLibraryChild methods. - int GetOtherValue() OVERRIDE; - void SetOtherValue(int value) OVERRIDE; + int GetOtherValue() override; + void SetOtherValue(int value) override; // CefTranslatorTestScopedLibrary methods. - int GetValue() OVERRIDE; - void SetValue(int value) OVERRIDE; + int GetValue() override; + void SetValue(int value) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h index 2cbf56e9c..844cfd20e 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=32beea0e95a0acdbf22d552970d719382785554a$ +// $hash=4ecab663ff0d6a777de108ff3d346eed68ca379d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CTOCPP_H_ @@ -35,8 +35,8 @@ class CefTranslatorTestScopedLibraryCToCpp virtual ~CefTranslatorTestScopedLibraryCToCpp(); // CefTranslatorTestScopedLibrary methods. - int GetValue() OVERRIDE; - void SetValue(int value) OVERRIDE; + int GetValue() override; + void SetValue(int value) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/thread_ctocpp.h b/libcef_dll/ctocpp/thread_ctocpp.h index ce8f0ceb1..122dad5d6 100644 --- a/libcef_dll/ctocpp/thread_ctocpp.h +++ b/libcef_dll/ctocpp/thread_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=67c710cc8e62052d841bcadb7aacc1ccddb4b54f$ +// $hash=b7b3e79350d42ab829eff401d6b4486ba4039267$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_THREAD_CTOCPP_H_ @@ -33,10 +33,10 @@ class CefThreadCToCpp virtual ~CefThreadCToCpp(); // CefThread methods. - CefRefPtr GetTaskRunner() OVERRIDE; - cef_platform_thread_id_t GetPlatformThreadId() OVERRIDE; - void Stop() OVERRIDE; - bool IsRunning() OVERRIDE; + CefRefPtr GetTaskRunner() override; + cef_platform_thread_id_t GetPlatformThreadId() override; + void Stop() override; + bool IsRunning() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_THREAD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/urlrequest_ctocpp.h b/libcef_dll/ctocpp/urlrequest_ctocpp.h index 80ac48621..59a6948ae 100644 --- a/libcef_dll/ctocpp/urlrequest_ctocpp.h +++ b/libcef_dll/ctocpp/urlrequest_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7751e600cb13017cbdfac3eae39dc7c94d2afec9$ +// $hash=7d81111a5bee29ff62a7778678e72085f9bd97d5$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_URLREQUEST_CTOCPP_H_ @@ -34,13 +34,13 @@ class CefURLRequestCToCpp : public CefCToCppRefCounted GetRequest() OVERRIDE; - CefRefPtr GetClient() OVERRIDE; - Status GetRequestStatus() OVERRIDE; - ErrorCode GetRequestError() OVERRIDE; - CefRefPtr GetResponse() OVERRIDE; - bool ResponseWasCached() OVERRIDE; - void Cancel() OVERRIDE; + CefRefPtr GetRequest() override; + CefRefPtr GetClient() override; + Status GetRequestStatus() override; + ErrorCode GetRequestError() override; + CefRefPtr GetResponse() override; + bool ResponseWasCached() override; + void Cancel() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_URLREQUEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8context_ctocpp.h b/libcef_dll/ctocpp/v8context_ctocpp.h index 08857be37..68a6d698c 100644 --- a/libcef_dll/ctocpp/v8context_ctocpp.h +++ b/libcef_dll/ctocpp/v8context_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=033d22b4a0516a84c2b319ee46a033af7a8009b2$ +// $hash=b6eff8c6efe30c1d3e310342c710bae76f018cb6$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8CONTEXT_CTOCPP_H_ @@ -34,19 +34,19 @@ class CefV8ContextCToCpp : public CefCToCppRefCounted GetTaskRunner() OVERRIDE; - bool IsValid() OVERRIDE; - CefRefPtr GetBrowser() OVERRIDE; - CefRefPtr GetFrame() OVERRIDE; - CefRefPtr GetGlobal() OVERRIDE; - bool Enter() OVERRIDE; - bool Exit() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; + CefRefPtr GetTaskRunner() override; + bool IsValid() override; + CefRefPtr GetBrowser() override; + CefRefPtr GetFrame() override; + CefRefPtr GetGlobal() override; + bool Enter() override; + bool Exit() override; + bool IsSame(CefRefPtr that) override; bool Eval(const CefString& code, const CefString& script_url, int start_line, CefRefPtr& retval, - CefRefPtr& exception) OVERRIDE; + CefRefPtr& exception) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_V8CONTEXT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8exception_ctocpp.h b/libcef_dll/ctocpp/v8exception_ctocpp.h index 2aefb4148..0663d4794 100644 --- a/libcef_dll/ctocpp/v8exception_ctocpp.h +++ b/libcef_dll/ctocpp/v8exception_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b6fc50fa3a6e0156743a5c3fce97b1a683e1720a$ +// $hash=a2b61cff85a5bf35797134b63606e4a043003f45$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8EXCEPTION_CTOCPP_H_ @@ -34,14 +34,14 @@ class CefV8ExceptionCToCpp : public CefCToCppRefCounted GetFrame(int index) OVERRIDE; + bool IsValid() override; + int GetFrameCount() override; + CefRefPtr GetFrame(int index) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_V8STACK_TRACE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8value_ctocpp.h b/libcef_dll/ctocpp/v8value_ctocpp.h index ddb675fbf..fc5e58daf 100644 --- a/libcef_dll/ctocpp/v8value_ctocpp.h +++ b/libcef_dll/ctocpp/v8value_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=910a0180e7ea517327b439aec32d6e4cede15e80$ +// $hash=69d5e62435d2481e821ce512ec9b609246add4e7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8VALUE_CTOCPP_H_ @@ -34,63 +34,63 @@ class CefV8ValueCToCpp virtual ~CefV8ValueCToCpp(); // CefV8Value methods. - bool IsValid() OVERRIDE; - bool IsUndefined() OVERRIDE; - bool IsNull() OVERRIDE; - bool IsBool() OVERRIDE; - bool IsInt() OVERRIDE; - bool IsUInt() OVERRIDE; - bool IsDouble() OVERRIDE; - bool IsDate() OVERRIDE; - bool IsString() OVERRIDE; - bool IsObject() OVERRIDE; - bool IsArray() OVERRIDE; - bool IsArrayBuffer() OVERRIDE; - bool IsFunction() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - bool GetBoolValue() OVERRIDE; - int32 GetIntValue() OVERRIDE; - uint32 GetUIntValue() OVERRIDE; - double GetDoubleValue() OVERRIDE; - CefTime GetDateValue() OVERRIDE; - CefString GetStringValue() OVERRIDE; - bool IsUserCreated() OVERRIDE; - bool HasException() OVERRIDE; - CefRefPtr GetException() OVERRIDE; - bool ClearException() OVERRIDE; - bool WillRethrowExceptions() OVERRIDE; - bool SetRethrowExceptions(bool rethrow) OVERRIDE; - bool HasValue(const CefString& key) OVERRIDE; - bool HasValue(int index) OVERRIDE; - bool DeleteValue(const CefString& key) OVERRIDE; - bool DeleteValue(int index) OVERRIDE; - CefRefPtr GetValue(const CefString& key) OVERRIDE; - CefRefPtr GetValue(int index) OVERRIDE; + bool IsValid() override; + bool IsUndefined() override; + bool IsNull() override; + bool IsBool() override; + bool IsInt() override; + bool IsUInt() override; + bool IsDouble() override; + bool IsDate() override; + bool IsString() override; + bool IsObject() override; + bool IsArray() override; + bool IsArrayBuffer() override; + bool IsFunction() override; + bool IsSame(CefRefPtr that) override; + bool GetBoolValue() override; + int32 GetIntValue() override; + uint32 GetUIntValue() override; + double GetDoubleValue() override; + CefTime GetDateValue() override; + CefString GetStringValue() override; + bool IsUserCreated() override; + bool HasException() override; + CefRefPtr GetException() override; + bool ClearException() override; + bool WillRethrowExceptions() override; + bool SetRethrowExceptions(bool rethrow) override; + bool HasValue(const CefString& key) override; + bool HasValue(int index) override; + bool DeleteValue(const CefString& key) override; + bool DeleteValue(int index) override; + CefRefPtr GetValue(const CefString& key) override; + CefRefPtr GetValue(int index) override; bool SetValue(const CefString& key, CefRefPtr value, - PropertyAttribute attribute) OVERRIDE; - bool SetValue(int index, CefRefPtr value) OVERRIDE; + PropertyAttribute attribute) override; + bool SetValue(int index, CefRefPtr value) override; bool SetValue(const CefString& key, AccessControl settings, - PropertyAttribute attribute) OVERRIDE; - bool GetKeys(std::vector& keys) OVERRIDE; - bool SetUserData(CefRefPtr user_data) OVERRIDE; - CefRefPtr GetUserData() OVERRIDE; - int GetExternallyAllocatedMemory() OVERRIDE; - int AdjustExternallyAllocatedMemory(int change_in_bytes) OVERRIDE; - int GetArrayLength() OVERRIDE; + PropertyAttribute attribute) override; + bool GetKeys(std::vector& keys) override; + bool SetUserData(CefRefPtr user_data) override; + CefRefPtr GetUserData() override; + int GetExternallyAllocatedMemory() override; + int AdjustExternallyAllocatedMemory(int change_in_bytes) override; + int GetArrayLength() override; CefRefPtr GetArrayBufferReleaseCallback() - OVERRIDE; - bool NeuterArrayBuffer() OVERRIDE; - CefString GetFunctionName() OVERRIDE; - CefRefPtr GetFunctionHandler() OVERRIDE; + override; + bool NeuterArrayBuffer() override; + CefString GetFunctionName() override; + CefRefPtr GetFunctionHandler() override; CefRefPtr ExecuteFunction( CefRefPtr object, - const CefV8ValueList& arguments) OVERRIDE; + const CefV8ValueList& arguments) override; CefRefPtr ExecuteFunctionWithContext( CefRefPtr context, CefRefPtr object, - const CefV8ValueList& arguments) OVERRIDE; + const CefV8ValueList& arguments) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_V8VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/value_ctocpp.h b/libcef_dll/ctocpp/value_ctocpp.h index d737f6785..3139ea8ea 100644 --- a/libcef_dll/ctocpp/value_ctocpp.h +++ b/libcef_dll/ctocpp/value_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5ade4141053ca1aa2f8c97eb4b93ab02af2aaf33$ +// $hash=5aadd498c1b3c4274e6ba7e8343308fa02fb1f23$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VALUE_CTOCPP_H_ @@ -33,28 +33,28 @@ class CefValueCToCpp virtual ~CefValueCToCpp(); // CefValue methods. - bool IsValid() OVERRIDE; - bool IsOwned() OVERRIDE; - bool IsReadOnly() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - bool IsEqual(CefRefPtr that) OVERRIDE; - CefRefPtr Copy() OVERRIDE; - CefValueType GetType() OVERRIDE; - bool GetBool() OVERRIDE; - int GetInt() OVERRIDE; - double GetDouble() OVERRIDE; - CefString GetString() OVERRIDE; - CefRefPtr GetBinary() OVERRIDE; - CefRefPtr GetDictionary() OVERRIDE; - CefRefPtr GetList() OVERRIDE; - bool SetNull() OVERRIDE; - bool SetBool(bool value) OVERRIDE; - bool SetInt(int value) OVERRIDE; - bool SetDouble(double value) OVERRIDE; - bool SetString(const CefString& value) OVERRIDE; - bool SetBinary(CefRefPtr value) OVERRIDE; - bool SetDictionary(CefRefPtr value) OVERRIDE; - bool SetList(CefRefPtr value) OVERRIDE; + bool IsValid() override; + bool IsOwned() override; + bool IsReadOnly() override; + bool IsSame(CefRefPtr that) override; + bool IsEqual(CefRefPtr that) override; + CefRefPtr Copy() override; + CefValueType GetType() override; + bool GetBool() override; + int GetInt() override; + double GetDouble() override; + CefString GetString() override; + CefRefPtr GetBinary() override; + CefRefPtr GetDictionary() override; + CefRefPtr GetList() override; + bool SetNull() override; + bool SetBool(bool value) override; + bool SetInt(int value) override; + bool SetDouble(double value) override; + bool SetString(const CefString& value) override; + bool SetBinary(CefRefPtr value) override; + bool SetDictionary(CefRefPtr value) override; + bool SetList(CefRefPtr value) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/box_layout_ctocpp.h b/libcef_dll/ctocpp/views/box_layout_ctocpp.h index 939190a71..0547e8552 100644 --- a/libcef_dll/ctocpp/views/box_layout_ctocpp.h +++ b/libcef_dll/ctocpp/views/box_layout_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=50dddd7ad5a249b2c8cfe95d766c3294c359b288$ +// $hash=c3ec7ad3ed23359659a1089e38b2f658193034ca$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BOX_LAYOUT_CTOCPP_H_ @@ -36,13 +36,13 @@ class CefBoxLayoutCToCpp : public CefCToCppRefCounted view, int flex) OVERRIDE; - void ClearFlexForView(CefRefPtr view) OVERRIDE; + void SetFlexForView(CefRefPtr view, int flex) override; + void ClearFlexForView(CefRefPtr view) override; // CefLayout methods. - CefRefPtr AsBoxLayout() OVERRIDE; - CefRefPtr AsFillLayout() OVERRIDE; - bool IsValid() OVERRIDE; + CefRefPtr AsBoxLayout() override; + CefRefPtr AsFillLayout() override; + bool IsValid() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_BOX_LAYOUT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/browser_view_ctocpp.h b/libcef_dll/ctocpp/views/browser_view_ctocpp.h index af2222ccc..d1759714a 100644 --- a/libcef_dll/ctocpp/views/browser_view_ctocpp.h +++ b/libcef_dll/ctocpp/views/browser_view_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f17d395c61d650a824016d14bc06d0cb9db9a6e6$ +// $hash=1c713db1e73d434b6bce3aea8e3a6dddbc547b61$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_CTOCPP_H_ @@ -34,59 +34,59 @@ class CefBrowserViewCToCpp : public CefCToCppRefCounted GetBrowser() OVERRIDE; - CefRefPtr GetChromeToolbar() OVERRIDE; - void SetPreferAccelerators(bool prefer_accelerators) OVERRIDE; + CefRefPtr GetBrowser() override; + CefRefPtr GetChromeToolbar() override; + void SetPreferAccelerators(bool prefer_accelerators) override; // CefView methods. - CefRefPtr AsBrowserView() OVERRIDE; - CefRefPtr AsButton() OVERRIDE; - CefRefPtr AsPanel() OVERRIDE; - CefRefPtr AsScrollView() OVERRIDE; - CefRefPtr AsTextfield() OVERRIDE; - CefString GetTypeString() OVERRIDE; - CefString ToString(bool include_children) OVERRIDE; - bool IsValid() OVERRIDE; - bool IsAttached() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetDelegate() OVERRIDE; - CefRefPtr GetWindow() OVERRIDE; - int GetID() OVERRIDE; - void SetID(int id) OVERRIDE; - int GetGroupID() OVERRIDE; - void SetGroupID(int group_id) OVERRIDE; - CefRefPtr GetParentView() OVERRIDE; - CefRefPtr GetViewForID(int id) OVERRIDE; - void SetBounds(const CefRect& bounds) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetBoundsInScreen() OVERRIDE; - void SetSize(const CefSize& size) OVERRIDE; - CefSize GetSize() OVERRIDE; - void SetPosition(const CefPoint& position) OVERRIDE; - CefPoint GetPosition() OVERRIDE; - CefSize GetPreferredSize() OVERRIDE; - void SizeToPreferredSize() OVERRIDE; - CefSize GetMinimumSize() OVERRIDE; - CefSize GetMaximumSize() OVERRIDE; - int GetHeightForWidth(int width) OVERRIDE; - void InvalidateLayout() OVERRIDE; - void SetVisible(bool visible) OVERRIDE; - bool IsVisible() OVERRIDE; - bool IsDrawn() OVERRIDE; - void SetEnabled(bool enabled) OVERRIDE; - bool IsEnabled() OVERRIDE; - void SetFocusable(bool focusable) OVERRIDE; - bool IsFocusable() OVERRIDE; - bool IsAccessibilityFocusable() OVERRIDE; - void RequestFocus() OVERRIDE; - void SetBackgroundColor(cef_color_t color) OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool ConvertPointToScreen(CefPoint& point) OVERRIDE; - bool ConvertPointFromScreen(CefPoint& point) OVERRIDE; - bool ConvertPointToWindow(CefPoint& point) OVERRIDE; - bool ConvertPointFromWindow(CefPoint& point) OVERRIDE; - bool ConvertPointToView(CefRefPtr view, CefPoint& point) OVERRIDE; - bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; + CefRefPtr AsBrowserView() override; + CefRefPtr AsButton() override; + CefRefPtr AsPanel() override; + CefRefPtr AsScrollView() override; + CefRefPtr AsTextfield() override; + CefString GetTypeString() override; + CefString ToString(bool include_children) override; + bool IsValid() override; + bool IsAttached() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetDelegate() override; + CefRefPtr GetWindow() override; + int GetID() override; + void SetID(int id) override; + int GetGroupID() override; + void SetGroupID(int group_id) override; + CefRefPtr GetParentView() override; + CefRefPtr GetViewForID(int id) override; + void SetBounds(const CefRect& bounds) override; + CefRect GetBounds() override; + CefRect GetBoundsInScreen() override; + void SetSize(const CefSize& size) override; + CefSize GetSize() override; + void SetPosition(const CefPoint& position) override; + CefPoint GetPosition() override; + CefSize GetPreferredSize() override; + void SizeToPreferredSize() override; + CefSize GetMinimumSize() override; + CefSize GetMaximumSize() override; + int GetHeightForWidth(int width) override; + void InvalidateLayout() override; + void SetVisible(bool visible) override; + bool IsVisible() override; + bool IsDrawn() override; + void SetEnabled(bool enabled) override; + bool IsEnabled() override; + void SetFocusable(bool focusable) override; + bool IsFocusable() override; + bool IsAccessibilityFocusable() override; + void RequestFocus() override; + void SetBackgroundColor(cef_color_t color) override; + cef_color_t GetBackgroundColor() override; + bool ConvertPointToScreen(CefPoint& point) override; + bool ConvertPointFromScreen(CefPoint& point) override; + bool ConvertPointToWindow(CefPoint& point) override; + bool ConvertPointFromWindow(CefPoint& point) override; + bool ConvertPointToView(CefRefPtr view, CefPoint& point) override; + bool ConvertPointFromView(CefRefPtr view, CefPoint& point) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/button_ctocpp.h b/libcef_dll/ctocpp/views/button_ctocpp.h index af803bb16..366b8fa5f 100644 --- a/libcef_dll/ctocpp/views/button_ctocpp.h +++ b/libcef_dll/ctocpp/views/button_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2741cab25f5633f178ba1f924abe58e418f1f084$ +// $hash=b543831782043e1651b8adfa907a60b553267ca7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BUTTON_CTOCPP_H_ @@ -35,62 +35,62 @@ class CefButtonCToCpp virtual ~CefButtonCToCpp(); // CefButton methods. - CefRefPtr AsLabelButton() OVERRIDE; - void SetState(cef_button_state_t state) OVERRIDE; - cef_button_state_t GetState() OVERRIDE; - void SetInkDropEnabled(bool enabled) OVERRIDE; - void SetTooltipText(const CefString& tooltip_text) OVERRIDE; - void SetAccessibleName(const CefString& name) OVERRIDE; + CefRefPtr AsLabelButton() override; + void SetState(cef_button_state_t state) override; + cef_button_state_t GetState() override; + void SetInkDropEnabled(bool enabled) override; + void SetTooltipText(const CefString& tooltip_text) override; + void SetAccessibleName(const CefString& name) override; // CefView methods. - CefRefPtr AsBrowserView() OVERRIDE; - CefRefPtr AsButton() OVERRIDE; - CefRefPtr AsPanel() OVERRIDE; - CefRefPtr AsScrollView() OVERRIDE; - CefRefPtr AsTextfield() OVERRIDE; - CefString GetTypeString() OVERRIDE; - CefString ToString(bool include_children) OVERRIDE; - bool IsValid() OVERRIDE; - bool IsAttached() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetDelegate() OVERRIDE; - CefRefPtr GetWindow() OVERRIDE; - int GetID() OVERRIDE; - void SetID(int id) OVERRIDE; - int GetGroupID() OVERRIDE; - void SetGroupID(int group_id) OVERRIDE; - CefRefPtr GetParentView() OVERRIDE; - CefRefPtr GetViewForID(int id) OVERRIDE; - void SetBounds(const CefRect& bounds) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetBoundsInScreen() OVERRIDE; - void SetSize(const CefSize& size) OVERRIDE; - CefSize GetSize() OVERRIDE; - void SetPosition(const CefPoint& position) OVERRIDE; - CefPoint GetPosition() OVERRIDE; - CefSize GetPreferredSize() OVERRIDE; - void SizeToPreferredSize() OVERRIDE; - CefSize GetMinimumSize() OVERRIDE; - CefSize GetMaximumSize() OVERRIDE; - int GetHeightForWidth(int width) OVERRIDE; - void InvalidateLayout() OVERRIDE; - void SetVisible(bool visible) OVERRIDE; - bool IsVisible() OVERRIDE; - bool IsDrawn() OVERRIDE; - void SetEnabled(bool enabled) OVERRIDE; - bool IsEnabled() OVERRIDE; - void SetFocusable(bool focusable) OVERRIDE; - bool IsFocusable() OVERRIDE; - bool IsAccessibilityFocusable() OVERRIDE; - void RequestFocus() OVERRIDE; - void SetBackgroundColor(cef_color_t color) OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool ConvertPointToScreen(CefPoint& point) OVERRIDE; - bool ConvertPointFromScreen(CefPoint& point) OVERRIDE; - bool ConvertPointToWindow(CefPoint& point) OVERRIDE; - bool ConvertPointFromWindow(CefPoint& point) OVERRIDE; - bool ConvertPointToView(CefRefPtr view, CefPoint& point) OVERRIDE; - bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; + CefRefPtr AsBrowserView() override; + CefRefPtr AsButton() override; + CefRefPtr AsPanel() override; + CefRefPtr AsScrollView() override; + CefRefPtr AsTextfield() override; + CefString GetTypeString() override; + CefString ToString(bool include_children) override; + bool IsValid() override; + bool IsAttached() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetDelegate() override; + CefRefPtr GetWindow() override; + int GetID() override; + void SetID(int id) override; + int GetGroupID() override; + void SetGroupID(int group_id) override; + CefRefPtr GetParentView() override; + CefRefPtr GetViewForID(int id) override; + void SetBounds(const CefRect& bounds) override; + CefRect GetBounds() override; + CefRect GetBoundsInScreen() override; + void SetSize(const CefSize& size) override; + CefSize GetSize() override; + void SetPosition(const CefPoint& position) override; + CefPoint GetPosition() override; + CefSize GetPreferredSize() override; + void SizeToPreferredSize() override; + CefSize GetMinimumSize() override; + CefSize GetMaximumSize() override; + int GetHeightForWidth(int width) override; + void InvalidateLayout() override; + void SetVisible(bool visible) override; + bool IsVisible() override; + bool IsDrawn() override; + void SetEnabled(bool enabled) override; + bool IsEnabled() override; + void SetFocusable(bool focusable) override; + bool IsFocusable() override; + bool IsAccessibilityFocusable() override; + void RequestFocus() override; + void SetBackgroundColor(cef_color_t color) override; + cef_color_t GetBackgroundColor() override; + bool ConvertPointToScreen(CefPoint& point) override; + bool ConvertPointFromScreen(CefPoint& point) override; + bool ConvertPointToWindow(CefPoint& point) override; + bool ConvertPointFromWindow(CefPoint& point) override; + bool ConvertPointToView(CefRefPtr view, CefPoint& point) override; + bool ConvertPointFromView(CefRefPtr view, CefPoint& point) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_BUTTON_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/display_ctocpp.h b/libcef_dll/ctocpp/views/display_ctocpp.h index bb5dfe437..69e6afc52 100644 --- a/libcef_dll/ctocpp/views/display_ctocpp.h +++ b/libcef_dll/ctocpp/views/display_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5f9d1b14172e8cbd5071f836319840c439b0c74f$ +// $hash=22aff48abcbe228e3e2991b9659e802c0c5b51fb$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_DISPLAY_CTOCPP_H_ @@ -33,13 +33,13 @@ class CefDisplayCToCpp virtual ~CefDisplayCToCpp(); // CefDisplay methods. - int64 GetID() OVERRIDE; - float GetDeviceScaleFactor() OVERRIDE; - void ConvertPointToPixels(CefPoint& point) OVERRIDE; - void ConvertPointFromPixels(CefPoint& point) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetWorkArea() OVERRIDE; - int GetRotation() OVERRIDE; + int64 GetID() override; + float GetDeviceScaleFactor() override; + void ConvertPointToPixels(CefPoint& point) override; + void ConvertPointFromPixels(CefPoint& point) override; + CefRect GetBounds() override; + CefRect GetWorkArea() override; + int GetRotation() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_DISPLAY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/fill_layout_ctocpp.h b/libcef_dll/ctocpp/views/fill_layout_ctocpp.h index 7a0b50e25..1c40def7a 100644 --- a/libcef_dll/ctocpp/views/fill_layout_ctocpp.h +++ b/libcef_dll/ctocpp/views/fill_layout_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=333a603b19a7093fcb7303382626a9542172da24$ +// $hash=572c204395f194e0de50b85a0be8e0e8e21cb7fd$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_FILL_LAYOUT_CTOCPP_H_ @@ -36,9 +36,9 @@ class CefFillLayoutCToCpp : public CefCToCppRefCounted AsBoxLayout() OVERRIDE; - CefRefPtr AsFillLayout() OVERRIDE; - bool IsValid() OVERRIDE; + CefRefPtr AsBoxLayout() override; + CefRefPtr AsFillLayout() override; + bool IsValid() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_FILL_LAYOUT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/label_button_ctocpp.h b/libcef_dll/ctocpp/views/label_button_ctocpp.h index e7b32f62e..9aa29766a 100644 --- a/libcef_dll/ctocpp/views/label_button_ctocpp.h +++ b/libcef_dll/ctocpp/views/label_button_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=303a2dc851723c3bf14c8dc8d58168d75d7f173a$ +// $hash=ef0338428bd0261ccfc0235718d8d1bd81e30315$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_LABEL_BUTTON_CTOCPP_H_ @@ -36,76 +36,76 @@ class CefLabelButtonCToCpp : public CefCToCppRefCounted AsMenuButton() OVERRIDE; - void SetText(const CefString& text) OVERRIDE; - CefString GetText() OVERRIDE; + CefRefPtr AsMenuButton() override; + void SetText(const CefString& text) override; + CefString GetText() override; void SetImage(cef_button_state_t button_state, - CefRefPtr image) OVERRIDE; - CefRefPtr GetImage(cef_button_state_t button_state) OVERRIDE; - void SetTextColor(cef_button_state_t for_state, cef_color_t color) OVERRIDE; - void SetEnabledTextColors(cef_color_t color) OVERRIDE; - void SetFontList(const CefString& font_list) OVERRIDE; - void SetHorizontalAlignment(cef_horizontal_alignment_t alignment) OVERRIDE; - void SetMinimumSize(const CefSize& size) OVERRIDE; - void SetMaximumSize(const CefSize& size) OVERRIDE; + CefRefPtr image) override; + CefRefPtr GetImage(cef_button_state_t button_state) override; + void SetTextColor(cef_button_state_t for_state, cef_color_t color) override; + void SetEnabledTextColors(cef_color_t color) override; + void SetFontList(const CefString& font_list) override; + void SetHorizontalAlignment(cef_horizontal_alignment_t alignment) override; + void SetMinimumSize(const CefSize& size) override; + void SetMaximumSize(const CefSize& size) override; // CefButton methods. - CefRefPtr AsLabelButton() OVERRIDE; - void SetState(cef_button_state_t state) OVERRIDE; - cef_button_state_t GetState() OVERRIDE; - void SetInkDropEnabled(bool enabled) OVERRIDE; - void SetTooltipText(const CefString& tooltip_text) OVERRIDE; - void SetAccessibleName(const CefString& name) OVERRIDE; + CefRefPtr AsLabelButton() override; + void SetState(cef_button_state_t state) override; + cef_button_state_t GetState() override; + void SetInkDropEnabled(bool enabled) override; + void SetTooltipText(const CefString& tooltip_text) override; + void SetAccessibleName(const CefString& name) override; // CefView methods. - CefRefPtr AsBrowserView() OVERRIDE; - CefRefPtr AsButton() OVERRIDE; - CefRefPtr AsPanel() OVERRIDE; - CefRefPtr AsScrollView() OVERRIDE; - CefRefPtr AsTextfield() OVERRIDE; - CefString GetTypeString() OVERRIDE; - CefString ToString(bool include_children) OVERRIDE; - bool IsValid() OVERRIDE; - bool IsAttached() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetDelegate() OVERRIDE; - CefRefPtr GetWindow() OVERRIDE; - int GetID() OVERRIDE; - void SetID(int id) OVERRIDE; - int GetGroupID() OVERRIDE; - void SetGroupID(int group_id) OVERRIDE; - CefRefPtr GetParentView() OVERRIDE; - CefRefPtr GetViewForID(int id) OVERRIDE; - void SetBounds(const CefRect& bounds) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetBoundsInScreen() OVERRIDE; - void SetSize(const CefSize& size) OVERRIDE; - CefSize GetSize() OVERRIDE; - void SetPosition(const CefPoint& position) OVERRIDE; - CefPoint GetPosition() OVERRIDE; - CefSize GetPreferredSize() OVERRIDE; - void SizeToPreferredSize() OVERRIDE; - CefSize GetMinimumSize() OVERRIDE; - CefSize GetMaximumSize() OVERRIDE; - int GetHeightForWidth(int width) OVERRIDE; - void InvalidateLayout() OVERRIDE; - void SetVisible(bool visible) OVERRIDE; - bool IsVisible() OVERRIDE; - bool IsDrawn() OVERRIDE; - void SetEnabled(bool enabled) OVERRIDE; - bool IsEnabled() OVERRIDE; - void SetFocusable(bool focusable) OVERRIDE; - bool IsFocusable() OVERRIDE; - bool IsAccessibilityFocusable() OVERRIDE; - void RequestFocus() OVERRIDE; - void SetBackgroundColor(cef_color_t color) OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool ConvertPointToScreen(CefPoint& point) OVERRIDE; - bool ConvertPointFromScreen(CefPoint& point) OVERRIDE; - bool ConvertPointToWindow(CefPoint& point) OVERRIDE; - bool ConvertPointFromWindow(CefPoint& point) OVERRIDE; - bool ConvertPointToView(CefRefPtr view, CefPoint& point) OVERRIDE; - bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; + CefRefPtr AsBrowserView() override; + CefRefPtr AsButton() override; + CefRefPtr AsPanel() override; + CefRefPtr AsScrollView() override; + CefRefPtr AsTextfield() override; + CefString GetTypeString() override; + CefString ToString(bool include_children) override; + bool IsValid() override; + bool IsAttached() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetDelegate() override; + CefRefPtr GetWindow() override; + int GetID() override; + void SetID(int id) override; + int GetGroupID() override; + void SetGroupID(int group_id) override; + CefRefPtr GetParentView() override; + CefRefPtr GetViewForID(int id) override; + void SetBounds(const CefRect& bounds) override; + CefRect GetBounds() override; + CefRect GetBoundsInScreen() override; + void SetSize(const CefSize& size) override; + CefSize GetSize() override; + void SetPosition(const CefPoint& position) override; + CefPoint GetPosition() override; + CefSize GetPreferredSize() override; + void SizeToPreferredSize() override; + CefSize GetMinimumSize() override; + CefSize GetMaximumSize() override; + int GetHeightForWidth(int width) override; + void InvalidateLayout() override; + void SetVisible(bool visible) override; + bool IsVisible() override; + bool IsDrawn() override; + void SetEnabled(bool enabled) override; + bool IsEnabled() override; + void SetFocusable(bool focusable) override; + bool IsFocusable() override; + bool IsAccessibilityFocusable() override; + void RequestFocus() override; + void SetBackgroundColor(cef_color_t color) override; + cef_color_t GetBackgroundColor() override; + bool ConvertPointToScreen(CefPoint& point) override; + bool ConvertPointFromScreen(CefPoint& point) override; + bool ConvertPointToWindow(CefPoint& point) override; + bool ConvertPointFromWindow(CefPoint& point) override; + bool ConvertPointToView(CefRefPtr view, CefPoint& point) override; + bool ConvertPointFromView(CefRefPtr view, CefPoint& point) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_LABEL_BUTTON_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/layout_ctocpp.h b/libcef_dll/ctocpp/views/layout_ctocpp.h index 02d4d5262..315827eaa 100644 --- a/libcef_dll/ctocpp/views/layout_ctocpp.h +++ b/libcef_dll/ctocpp/views/layout_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4f7c396f1ffa7895fcf12595e623f6466f396b2a$ +// $hash=a4bab65668eebf704fc7156df4589cb2a7b0fe50$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_LAYOUT_CTOCPP_H_ @@ -37,9 +37,9 @@ class CefLayoutCToCpp virtual ~CefLayoutCToCpp(); // CefLayout methods. - CefRefPtr AsBoxLayout() OVERRIDE; - CefRefPtr AsFillLayout() OVERRIDE; - bool IsValid() OVERRIDE; + CefRefPtr AsBoxLayout() override; + CefRefPtr AsFillLayout() override; + bool IsValid() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_LAYOUT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/menu_button_ctocpp.h b/libcef_dll/ctocpp/views/menu_button_ctocpp.h index c25b5d7de..4de14cb90 100644 --- a/libcef_dll/ctocpp/views/menu_button_ctocpp.h +++ b/libcef_dll/ctocpp/views/menu_button_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b8208488ed5afed11401a1e2dd647af06a8fe25a$ +// $hash=90b4b0b803eaeef6873d455a2686dfd9f56a9fc3$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_CTOCPP_H_ @@ -36,80 +36,80 @@ class CefMenuButtonCToCpp : public CefCToCppRefCounted menu_model, const CefPoint& screen_point, - cef_menu_anchor_position_t anchor_position) OVERRIDE; - void TriggerMenu() OVERRIDE; + cef_menu_anchor_position_t anchor_position) override; + void TriggerMenu() override; // CefLabelButton methods. - CefRefPtr AsMenuButton() OVERRIDE; - void SetText(const CefString& text) OVERRIDE; - CefString GetText() OVERRIDE; + CefRefPtr AsMenuButton() override; + void SetText(const CefString& text) override; + CefString GetText() override; void SetImage(cef_button_state_t button_state, - CefRefPtr image) OVERRIDE; - CefRefPtr GetImage(cef_button_state_t button_state) OVERRIDE; - void SetTextColor(cef_button_state_t for_state, cef_color_t color) OVERRIDE; - void SetEnabledTextColors(cef_color_t color) OVERRIDE; - void SetFontList(const CefString& font_list) OVERRIDE; - void SetHorizontalAlignment(cef_horizontal_alignment_t alignment) OVERRIDE; - void SetMinimumSize(const CefSize& size) OVERRIDE; - void SetMaximumSize(const CefSize& size) OVERRIDE; + CefRefPtr image) override; + CefRefPtr GetImage(cef_button_state_t button_state) override; + void SetTextColor(cef_button_state_t for_state, cef_color_t color) override; + void SetEnabledTextColors(cef_color_t color) override; + void SetFontList(const CefString& font_list) override; + void SetHorizontalAlignment(cef_horizontal_alignment_t alignment) override; + void SetMinimumSize(const CefSize& size) override; + void SetMaximumSize(const CefSize& size) override; // CefButton methods. - CefRefPtr AsLabelButton() OVERRIDE; - void SetState(cef_button_state_t state) OVERRIDE; - cef_button_state_t GetState() OVERRIDE; - void SetInkDropEnabled(bool enabled) OVERRIDE; - void SetTooltipText(const CefString& tooltip_text) OVERRIDE; - void SetAccessibleName(const CefString& name) OVERRIDE; + CefRefPtr AsLabelButton() override; + void SetState(cef_button_state_t state) override; + cef_button_state_t GetState() override; + void SetInkDropEnabled(bool enabled) override; + void SetTooltipText(const CefString& tooltip_text) override; + void SetAccessibleName(const CefString& name) override; // CefView methods. - CefRefPtr AsBrowserView() OVERRIDE; - CefRefPtr AsButton() OVERRIDE; - CefRefPtr AsPanel() OVERRIDE; - CefRefPtr AsScrollView() OVERRIDE; - CefRefPtr AsTextfield() OVERRIDE; - CefString GetTypeString() OVERRIDE; - CefString ToString(bool include_children) OVERRIDE; - bool IsValid() OVERRIDE; - bool IsAttached() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetDelegate() OVERRIDE; - CefRefPtr GetWindow() OVERRIDE; - int GetID() OVERRIDE; - void SetID(int id) OVERRIDE; - int GetGroupID() OVERRIDE; - void SetGroupID(int group_id) OVERRIDE; - CefRefPtr GetParentView() OVERRIDE; - CefRefPtr GetViewForID(int id) OVERRIDE; - void SetBounds(const CefRect& bounds) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetBoundsInScreen() OVERRIDE; - void SetSize(const CefSize& size) OVERRIDE; - CefSize GetSize() OVERRIDE; - void SetPosition(const CefPoint& position) OVERRIDE; - CefPoint GetPosition() OVERRIDE; - CefSize GetPreferredSize() OVERRIDE; - void SizeToPreferredSize() OVERRIDE; - CefSize GetMinimumSize() OVERRIDE; - CefSize GetMaximumSize() OVERRIDE; - int GetHeightForWidth(int width) OVERRIDE; - void InvalidateLayout() OVERRIDE; - void SetVisible(bool visible) OVERRIDE; - bool IsVisible() OVERRIDE; - bool IsDrawn() OVERRIDE; - void SetEnabled(bool enabled) OVERRIDE; - bool IsEnabled() OVERRIDE; - void SetFocusable(bool focusable) OVERRIDE; - bool IsFocusable() OVERRIDE; - bool IsAccessibilityFocusable() OVERRIDE; - void RequestFocus() OVERRIDE; - void SetBackgroundColor(cef_color_t color) OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool ConvertPointToScreen(CefPoint& point) OVERRIDE; - bool ConvertPointFromScreen(CefPoint& point) OVERRIDE; - bool ConvertPointToWindow(CefPoint& point) OVERRIDE; - bool ConvertPointFromWindow(CefPoint& point) OVERRIDE; - bool ConvertPointToView(CefRefPtr view, CefPoint& point) OVERRIDE; - bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; + CefRefPtr AsBrowserView() override; + CefRefPtr AsButton() override; + CefRefPtr AsPanel() override; + CefRefPtr AsScrollView() override; + CefRefPtr AsTextfield() override; + CefString GetTypeString() override; + CefString ToString(bool include_children) override; + bool IsValid() override; + bool IsAttached() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetDelegate() override; + CefRefPtr GetWindow() override; + int GetID() override; + void SetID(int id) override; + int GetGroupID() override; + void SetGroupID(int group_id) override; + CefRefPtr GetParentView() override; + CefRefPtr GetViewForID(int id) override; + void SetBounds(const CefRect& bounds) override; + CefRect GetBounds() override; + CefRect GetBoundsInScreen() override; + void SetSize(const CefSize& size) override; + CefSize GetSize() override; + void SetPosition(const CefPoint& position) override; + CefPoint GetPosition() override; + CefSize GetPreferredSize() override; + void SizeToPreferredSize() override; + CefSize GetMinimumSize() override; + CefSize GetMaximumSize() override; + int GetHeightForWidth(int width) override; + void InvalidateLayout() override; + void SetVisible(bool visible) override; + bool IsVisible() override; + bool IsDrawn() override; + void SetEnabled(bool enabled) override; + bool IsEnabled() override; + void SetFocusable(bool focusable) override; + bool IsFocusable() override; + bool IsAccessibilityFocusable() override; + void RequestFocus() override; + void SetBackgroundColor(cef_color_t color) override; + cef_color_t GetBackgroundColor() override; + bool ConvertPointToScreen(CefPoint& point) override; + bool ConvertPointFromScreen(CefPoint& point) override; + bool ConvertPointToWindow(CefPoint& point) override; + bool ConvertPointFromWindow(CefPoint& point) override; + bool ConvertPointToView(CefRefPtr view, CefPoint& point) override; + bool ConvertPointFromView(CefRefPtr view, CefPoint& point) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/panel_ctocpp.h b/libcef_dll/ctocpp/views/panel_ctocpp.h index 242849532..69833bec5 100644 --- a/libcef_dll/ctocpp/views/panel_ctocpp.h +++ b/libcef_dll/ctocpp/views/panel_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=190c731496daef9548f00ed5306c89dac367f035$ +// $hash=c2d630805de3dbcb47933c566b791c0e2fb7e6d7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_PANEL_CTOCPP_H_ @@ -41,69 +41,69 @@ class CefPanelCToCpp virtual ~CefPanelCToCpp(); // CefPanel methods. - CefRefPtr AsWindow() OVERRIDE; - CefRefPtr SetToFillLayout() OVERRIDE; + CefRefPtr AsWindow() override; + CefRefPtr SetToFillLayout() override; CefRefPtr SetToBoxLayout( - const CefBoxLayoutSettings& settings) OVERRIDE; - CefRefPtr GetLayout() OVERRIDE; - void Layout() OVERRIDE; - void AddChildView(CefRefPtr view) OVERRIDE; - void AddChildViewAt(CefRefPtr view, int index) OVERRIDE; - void ReorderChildView(CefRefPtr view, int index) OVERRIDE; - void RemoveChildView(CefRefPtr view) OVERRIDE; - void RemoveAllChildViews() OVERRIDE; - size_t GetChildViewCount() OVERRIDE; - CefRefPtr GetChildViewAt(int index) OVERRIDE; + const CefBoxLayoutSettings& settings) override; + CefRefPtr GetLayout() override; + void Layout() override; + void AddChildView(CefRefPtr view) override; + void AddChildViewAt(CefRefPtr view, int index) override; + void ReorderChildView(CefRefPtr view, int index) override; + void RemoveChildView(CefRefPtr view) override; + void RemoveAllChildViews() override; + size_t GetChildViewCount() override; + CefRefPtr GetChildViewAt(int index) override; // CefView methods. - CefRefPtr AsBrowserView() OVERRIDE; - CefRefPtr AsButton() OVERRIDE; - CefRefPtr AsPanel() OVERRIDE; - CefRefPtr AsScrollView() OVERRIDE; - CefRefPtr AsTextfield() OVERRIDE; - CefString GetTypeString() OVERRIDE; - CefString ToString(bool include_children) OVERRIDE; - bool IsValid() OVERRIDE; - bool IsAttached() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetDelegate() OVERRIDE; - CefRefPtr GetWindow() OVERRIDE; - int GetID() OVERRIDE; - void SetID(int id) OVERRIDE; - int GetGroupID() OVERRIDE; - void SetGroupID(int group_id) OVERRIDE; - CefRefPtr GetParentView() OVERRIDE; - CefRefPtr GetViewForID(int id) OVERRIDE; - void SetBounds(const CefRect& bounds) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetBoundsInScreen() OVERRIDE; - void SetSize(const CefSize& size) OVERRIDE; - CefSize GetSize() OVERRIDE; - void SetPosition(const CefPoint& position) OVERRIDE; - CefPoint GetPosition() OVERRIDE; - CefSize GetPreferredSize() OVERRIDE; - void SizeToPreferredSize() OVERRIDE; - CefSize GetMinimumSize() OVERRIDE; - CefSize GetMaximumSize() OVERRIDE; - int GetHeightForWidth(int width) OVERRIDE; - void InvalidateLayout() OVERRIDE; - void SetVisible(bool visible) OVERRIDE; - bool IsVisible() OVERRIDE; - bool IsDrawn() OVERRIDE; - void SetEnabled(bool enabled) OVERRIDE; - bool IsEnabled() OVERRIDE; - void SetFocusable(bool focusable) OVERRIDE; - bool IsFocusable() OVERRIDE; - bool IsAccessibilityFocusable() OVERRIDE; - void RequestFocus() OVERRIDE; - void SetBackgroundColor(cef_color_t color) OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool ConvertPointToScreen(CefPoint& point) OVERRIDE; - bool ConvertPointFromScreen(CefPoint& point) OVERRIDE; - bool ConvertPointToWindow(CefPoint& point) OVERRIDE; - bool ConvertPointFromWindow(CefPoint& point) OVERRIDE; - bool ConvertPointToView(CefRefPtr view, CefPoint& point) OVERRIDE; - bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; + CefRefPtr AsBrowserView() override; + CefRefPtr AsButton() override; + CefRefPtr AsPanel() override; + CefRefPtr AsScrollView() override; + CefRefPtr AsTextfield() override; + CefString GetTypeString() override; + CefString ToString(bool include_children) override; + bool IsValid() override; + bool IsAttached() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetDelegate() override; + CefRefPtr GetWindow() override; + int GetID() override; + void SetID(int id) override; + int GetGroupID() override; + void SetGroupID(int group_id) override; + CefRefPtr GetParentView() override; + CefRefPtr GetViewForID(int id) override; + void SetBounds(const CefRect& bounds) override; + CefRect GetBounds() override; + CefRect GetBoundsInScreen() override; + void SetSize(const CefSize& size) override; + CefSize GetSize() override; + void SetPosition(const CefPoint& position) override; + CefPoint GetPosition() override; + CefSize GetPreferredSize() override; + void SizeToPreferredSize() override; + CefSize GetMinimumSize() override; + CefSize GetMaximumSize() override; + int GetHeightForWidth(int width) override; + void InvalidateLayout() override; + void SetVisible(bool visible) override; + bool IsVisible() override; + bool IsDrawn() override; + void SetEnabled(bool enabled) override; + bool IsEnabled() override; + void SetFocusable(bool focusable) override; + bool IsFocusable() override; + bool IsAccessibilityFocusable() override; + void RequestFocus() override; + void SetBackgroundColor(cef_color_t color) override; + cef_color_t GetBackgroundColor() override; + bool ConvertPointToScreen(CefPoint& point) override; + bool ConvertPointFromScreen(CefPoint& point) override; + bool ConvertPointToWindow(CefPoint& point) override; + bool ConvertPointFromWindow(CefPoint& point) override; + bool ConvertPointToView(CefRefPtr view, CefPoint& point) override; + bool ConvertPointFromView(CefRefPtr view, CefPoint& point) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_PANEL_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/scroll_view_ctocpp.h b/libcef_dll/ctocpp/views/scroll_view_ctocpp.h index 939ae3aac..bde1b1dd3 100644 --- a/libcef_dll/ctocpp/views/scroll_view_ctocpp.h +++ b/libcef_dll/ctocpp/views/scroll_view_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0a09eb1829f89d4f677c43909e0d4e1727ba1758$ +// $hash=20f4f752402507b4573596d6759c93cd1bc7a982$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_SCROLL_VIEW_CTOCPP_H_ @@ -34,63 +34,63 @@ class CefScrollViewCToCpp : public CefCToCppRefCounted view) OVERRIDE; - CefRefPtr GetContentView() OVERRIDE; - CefRect GetVisibleContentRect() OVERRIDE; - bool HasHorizontalScrollbar() OVERRIDE; - int GetHorizontalScrollbarHeight() OVERRIDE; - bool HasVerticalScrollbar() OVERRIDE; - int GetVerticalScrollbarWidth() OVERRIDE; + void SetContentView(CefRefPtr view) override; + CefRefPtr GetContentView() override; + CefRect GetVisibleContentRect() override; + bool HasHorizontalScrollbar() override; + int GetHorizontalScrollbarHeight() override; + bool HasVerticalScrollbar() override; + int GetVerticalScrollbarWidth() override; // CefView methods. - CefRefPtr AsBrowserView() OVERRIDE; - CefRefPtr AsButton() OVERRIDE; - CefRefPtr AsPanel() OVERRIDE; - CefRefPtr AsScrollView() OVERRIDE; - CefRefPtr AsTextfield() OVERRIDE; - CefString GetTypeString() OVERRIDE; - CefString ToString(bool include_children) OVERRIDE; - bool IsValid() OVERRIDE; - bool IsAttached() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetDelegate() OVERRIDE; - CefRefPtr GetWindow() OVERRIDE; - int GetID() OVERRIDE; - void SetID(int id) OVERRIDE; - int GetGroupID() OVERRIDE; - void SetGroupID(int group_id) OVERRIDE; - CefRefPtr GetParentView() OVERRIDE; - CefRefPtr GetViewForID(int id) OVERRIDE; - void SetBounds(const CefRect& bounds) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetBoundsInScreen() OVERRIDE; - void SetSize(const CefSize& size) OVERRIDE; - CefSize GetSize() OVERRIDE; - void SetPosition(const CefPoint& position) OVERRIDE; - CefPoint GetPosition() OVERRIDE; - CefSize GetPreferredSize() OVERRIDE; - void SizeToPreferredSize() OVERRIDE; - CefSize GetMinimumSize() OVERRIDE; - CefSize GetMaximumSize() OVERRIDE; - int GetHeightForWidth(int width) OVERRIDE; - void InvalidateLayout() OVERRIDE; - void SetVisible(bool visible) OVERRIDE; - bool IsVisible() OVERRIDE; - bool IsDrawn() OVERRIDE; - void SetEnabled(bool enabled) OVERRIDE; - bool IsEnabled() OVERRIDE; - void SetFocusable(bool focusable) OVERRIDE; - bool IsFocusable() OVERRIDE; - bool IsAccessibilityFocusable() OVERRIDE; - void RequestFocus() OVERRIDE; - void SetBackgroundColor(cef_color_t color) OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool ConvertPointToScreen(CefPoint& point) OVERRIDE; - bool ConvertPointFromScreen(CefPoint& point) OVERRIDE; - bool ConvertPointToWindow(CefPoint& point) OVERRIDE; - bool ConvertPointFromWindow(CefPoint& point) OVERRIDE; - bool ConvertPointToView(CefRefPtr view, CefPoint& point) OVERRIDE; - bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; + CefRefPtr AsBrowserView() override; + CefRefPtr AsButton() override; + CefRefPtr AsPanel() override; + CefRefPtr AsScrollView() override; + CefRefPtr AsTextfield() override; + CefString GetTypeString() override; + CefString ToString(bool include_children) override; + bool IsValid() override; + bool IsAttached() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetDelegate() override; + CefRefPtr GetWindow() override; + int GetID() override; + void SetID(int id) override; + int GetGroupID() override; + void SetGroupID(int group_id) override; + CefRefPtr GetParentView() override; + CefRefPtr GetViewForID(int id) override; + void SetBounds(const CefRect& bounds) override; + CefRect GetBounds() override; + CefRect GetBoundsInScreen() override; + void SetSize(const CefSize& size) override; + CefSize GetSize() override; + void SetPosition(const CefPoint& position) override; + CefPoint GetPosition() override; + CefSize GetPreferredSize() override; + void SizeToPreferredSize() override; + CefSize GetMinimumSize() override; + CefSize GetMaximumSize() override; + int GetHeightForWidth(int width) override; + void InvalidateLayout() override; + void SetVisible(bool visible) override; + bool IsVisible() override; + bool IsDrawn() override; + void SetEnabled(bool enabled) override; + bool IsEnabled() override; + void SetFocusable(bool focusable) override; + bool IsFocusable() override; + bool IsAccessibilityFocusable() override; + void RequestFocus() override; + void SetBackgroundColor(cef_color_t color) override; + cef_color_t GetBackgroundColor() override; + bool ConvertPointToScreen(CefPoint& point) override; + bool ConvertPointFromScreen(CefPoint& point) override; + bool ConvertPointToWindow(CefPoint& point) override; + bool ConvertPointFromWindow(CefPoint& point) override; + bool ConvertPointToView(CefRefPtr view, CefPoint& point) override; + bool ConvertPointFromView(CefRefPtr view, CefPoint& point) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_SCROLL_VIEW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/textfield_ctocpp.h b/libcef_dll/ctocpp/views/textfield_ctocpp.h index 0beb9c123..b3dcd470f 100644 --- a/libcef_dll/ctocpp/views/textfield_ctocpp.h +++ b/libcef_dll/ctocpp/views/textfield_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f57b9f72a806aecacaa984faf584fdf7c1c99301$ +// $hash=e907d476bdd6717660c7e35f55ab9a1679f0f1fb$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_TEXTFIELD_CTOCPP_H_ @@ -34,89 +34,89 @@ class CefTextfieldCToCpp : public CefCToCppRefCounted AsBrowserView() OVERRIDE; - CefRefPtr AsButton() OVERRIDE; - CefRefPtr AsPanel() OVERRIDE; - CefRefPtr AsScrollView() OVERRIDE; - CefRefPtr AsTextfield() OVERRIDE; - CefString GetTypeString() OVERRIDE; - CefString ToString(bool include_children) OVERRIDE; - bool IsValid() OVERRIDE; - bool IsAttached() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetDelegate() OVERRIDE; - CefRefPtr GetWindow() OVERRIDE; - int GetID() OVERRIDE; - void SetID(int id) OVERRIDE; - int GetGroupID() OVERRIDE; - void SetGroupID(int group_id) OVERRIDE; - CefRefPtr GetParentView() OVERRIDE; - CefRefPtr GetViewForID(int id) OVERRIDE; - void SetBounds(const CefRect& bounds) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetBoundsInScreen() OVERRIDE; - void SetSize(const CefSize& size) OVERRIDE; - CefSize GetSize() OVERRIDE; - void SetPosition(const CefPoint& position) OVERRIDE; - CefPoint GetPosition() OVERRIDE; - CefSize GetPreferredSize() OVERRIDE; - void SizeToPreferredSize() OVERRIDE; - CefSize GetMinimumSize() OVERRIDE; - CefSize GetMaximumSize() OVERRIDE; - int GetHeightForWidth(int width) OVERRIDE; - void InvalidateLayout() OVERRIDE; - void SetVisible(bool visible) OVERRIDE; - bool IsVisible() OVERRIDE; - bool IsDrawn() OVERRIDE; - void SetEnabled(bool enabled) OVERRIDE; - bool IsEnabled() OVERRIDE; - void SetFocusable(bool focusable) OVERRIDE; - bool IsFocusable() OVERRIDE; - bool IsAccessibilityFocusable() OVERRIDE; - void RequestFocus() OVERRIDE; - void SetBackgroundColor(cef_color_t color) OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool ConvertPointToScreen(CefPoint& point) OVERRIDE; - bool ConvertPointFromScreen(CefPoint& point) OVERRIDE; - bool ConvertPointToWindow(CefPoint& point) OVERRIDE; - bool ConvertPointFromWindow(CefPoint& point) OVERRIDE; - bool ConvertPointToView(CefRefPtr view, CefPoint& point) OVERRIDE; - bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; + CefRefPtr AsBrowserView() override; + CefRefPtr AsButton() override; + CefRefPtr AsPanel() override; + CefRefPtr AsScrollView() override; + CefRefPtr AsTextfield() override; + CefString GetTypeString() override; + CefString ToString(bool include_children) override; + bool IsValid() override; + bool IsAttached() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetDelegate() override; + CefRefPtr GetWindow() override; + int GetID() override; + void SetID(int id) override; + int GetGroupID() override; + void SetGroupID(int group_id) override; + CefRefPtr GetParentView() override; + CefRefPtr GetViewForID(int id) override; + void SetBounds(const CefRect& bounds) override; + CefRect GetBounds() override; + CefRect GetBoundsInScreen() override; + void SetSize(const CefSize& size) override; + CefSize GetSize() override; + void SetPosition(const CefPoint& position) override; + CefPoint GetPosition() override; + CefSize GetPreferredSize() override; + void SizeToPreferredSize() override; + CefSize GetMinimumSize() override; + CefSize GetMaximumSize() override; + int GetHeightForWidth(int width) override; + void InvalidateLayout() override; + void SetVisible(bool visible) override; + bool IsVisible() override; + bool IsDrawn() override; + void SetEnabled(bool enabled) override; + bool IsEnabled() override; + void SetFocusable(bool focusable) override; + bool IsFocusable() override; + bool IsAccessibilityFocusable() override; + void RequestFocus() override; + void SetBackgroundColor(cef_color_t color) override; + cef_color_t GetBackgroundColor() override; + bool ConvertPointToScreen(CefPoint& point) override; + bool ConvertPointFromScreen(CefPoint& point) override; + bool ConvertPointToWindow(CefPoint& point) override; + bool ConvertPointFromWindow(CefPoint& point) override; + bool ConvertPointToView(CefRefPtr view, CefPoint& point) override; + bool ConvertPointFromView(CefRefPtr view, CefPoint& point) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_TEXTFIELD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/view_ctocpp.h b/libcef_dll/ctocpp/views/view_ctocpp.h index fb48b96b0..94ba42392 100644 --- a/libcef_dll/ctocpp/views/view_ctocpp.h +++ b/libcef_dll/ctocpp/views/view_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=841ccd4760ce1b41c48476df1575b1ac61661a23$ +// $hash=a821d193174f4b6e06db1a003aece65eb1e0db02$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_VIEW_CTOCPP_H_ @@ -45,54 +45,54 @@ class CefViewCToCpp virtual ~CefViewCToCpp(); // CefView methods. - CefRefPtr AsBrowserView() OVERRIDE; - CefRefPtr AsButton() OVERRIDE; - CefRefPtr AsPanel() OVERRIDE; - CefRefPtr AsScrollView() OVERRIDE; - CefRefPtr AsTextfield() OVERRIDE; - CefString GetTypeString() OVERRIDE; - CefString ToString(bool include_children) OVERRIDE; - bool IsValid() OVERRIDE; - bool IsAttached() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetDelegate() OVERRIDE; - CefRefPtr GetWindow() OVERRIDE; - int GetID() OVERRIDE; - void SetID(int id) OVERRIDE; - int GetGroupID() OVERRIDE; - void SetGroupID(int group_id) OVERRIDE; - CefRefPtr GetParentView() OVERRIDE; - CefRefPtr GetViewForID(int id) OVERRIDE; - void SetBounds(const CefRect& bounds) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetBoundsInScreen() OVERRIDE; - void SetSize(const CefSize& size) OVERRIDE; - CefSize GetSize() OVERRIDE; - void SetPosition(const CefPoint& position) OVERRIDE; - CefPoint GetPosition() OVERRIDE; - CefSize GetPreferredSize() OVERRIDE; - void SizeToPreferredSize() OVERRIDE; - CefSize GetMinimumSize() OVERRIDE; - CefSize GetMaximumSize() OVERRIDE; - int GetHeightForWidth(int width) OVERRIDE; - void InvalidateLayout() OVERRIDE; - void SetVisible(bool visible) OVERRIDE; - bool IsVisible() OVERRIDE; - bool IsDrawn() OVERRIDE; - void SetEnabled(bool enabled) OVERRIDE; - bool IsEnabled() OVERRIDE; - void SetFocusable(bool focusable) OVERRIDE; - bool IsFocusable() OVERRIDE; - bool IsAccessibilityFocusable() OVERRIDE; - void RequestFocus() OVERRIDE; - void SetBackgroundColor(cef_color_t color) OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool ConvertPointToScreen(CefPoint& point) OVERRIDE; - bool ConvertPointFromScreen(CefPoint& point) OVERRIDE; - bool ConvertPointToWindow(CefPoint& point) OVERRIDE; - bool ConvertPointFromWindow(CefPoint& point) OVERRIDE; - bool ConvertPointToView(CefRefPtr view, CefPoint& point) OVERRIDE; - bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; + CefRefPtr AsBrowserView() override; + CefRefPtr AsButton() override; + CefRefPtr AsPanel() override; + CefRefPtr AsScrollView() override; + CefRefPtr AsTextfield() override; + CefString GetTypeString() override; + CefString ToString(bool include_children) override; + bool IsValid() override; + bool IsAttached() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetDelegate() override; + CefRefPtr GetWindow() override; + int GetID() override; + void SetID(int id) override; + int GetGroupID() override; + void SetGroupID(int group_id) override; + CefRefPtr GetParentView() override; + CefRefPtr GetViewForID(int id) override; + void SetBounds(const CefRect& bounds) override; + CefRect GetBounds() override; + CefRect GetBoundsInScreen() override; + void SetSize(const CefSize& size) override; + CefSize GetSize() override; + void SetPosition(const CefPoint& position) override; + CefPoint GetPosition() override; + CefSize GetPreferredSize() override; + void SizeToPreferredSize() override; + CefSize GetMinimumSize() override; + CefSize GetMaximumSize() override; + int GetHeightForWidth(int width) override; + void InvalidateLayout() override; + void SetVisible(bool visible) override; + bool IsVisible() override; + bool IsDrawn() override; + void SetEnabled(bool enabled) override; + bool IsEnabled() override; + void SetFocusable(bool focusable) override; + bool IsFocusable() override; + bool IsAccessibilityFocusable() override; + void RequestFocus() override; + void SetBackgroundColor(cef_color_t color) override; + cef_color_t GetBackgroundColor() override; + bool ConvertPointToScreen(CefPoint& point) override; + bool ConvertPointFromScreen(CefPoint& point) override; + bool ConvertPointToWindow(CefPoint& point) override; + bool ConvertPointFromWindow(CefPoint& point) override; + bool ConvertPointToView(CefRefPtr view, CefPoint& point) override; + bool ConvertPointFromView(CefRefPtr view, CefPoint& point) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_VIEW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/window_ctocpp.h b/libcef_dll/ctocpp/views/window_ctocpp.h index e680f68c7..77e4e05a7 100644 --- a/libcef_dll/ctocpp/views/window_ctocpp.h +++ b/libcef_dll/ctocpp/views/window_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6aa7373f97dc08f125b239bd6018bc9ad2c52c3c$ +// $hash=f2fbf4be1755ed8793c2d471d65eddbdf4ba148b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_CTOCPP_H_ @@ -34,116 +34,116 @@ class CefWindowCToCpp virtual ~CefWindowCToCpp(); // CefWindow methods. - void Show() OVERRIDE; - void Hide() OVERRIDE; - void CenterWindow(const CefSize& size) OVERRIDE; - void Close() OVERRIDE; - bool IsClosed() OVERRIDE; - void Activate() OVERRIDE; - void Deactivate() OVERRIDE; - bool IsActive() OVERRIDE; - void BringToTop() OVERRIDE; - void SetAlwaysOnTop(bool on_top) OVERRIDE; - bool IsAlwaysOnTop() OVERRIDE; - void Maximize() OVERRIDE; - void Minimize() OVERRIDE; - void Restore() OVERRIDE; - void SetFullscreen(bool fullscreen) OVERRIDE; - bool IsMaximized() OVERRIDE; - bool IsMinimized() OVERRIDE; - bool IsFullscreen() OVERRIDE; - void SetTitle(const CefString& title) OVERRIDE; - CefString GetTitle() OVERRIDE; - void SetWindowIcon(CefRefPtr image) OVERRIDE; - CefRefPtr GetWindowIcon() OVERRIDE; - void SetWindowAppIcon(CefRefPtr image) OVERRIDE; - CefRefPtr GetWindowAppIcon() OVERRIDE; + void Show() override; + void Hide() override; + void CenterWindow(const CefSize& size) override; + void Close() override; + bool IsClosed() override; + void Activate() override; + void Deactivate() override; + bool IsActive() override; + void BringToTop() override; + void SetAlwaysOnTop(bool on_top) override; + bool IsAlwaysOnTop() override; + void Maximize() override; + void Minimize() override; + void Restore() override; + void SetFullscreen(bool fullscreen) override; + bool IsMaximized() override; + bool IsMinimized() override; + bool IsFullscreen() override; + void SetTitle(const CefString& title) override; + CefString GetTitle() override; + void SetWindowIcon(CefRefPtr image) override; + CefRefPtr GetWindowIcon() override; + void SetWindowAppIcon(CefRefPtr image) override; + CefRefPtr GetWindowAppIcon() override; void ShowMenu(CefRefPtr menu_model, const CefPoint& screen_point, - cef_menu_anchor_position_t anchor_position) OVERRIDE; - void CancelMenu() OVERRIDE; - CefRefPtr GetDisplay() OVERRIDE; - CefRect GetClientAreaBoundsInScreen() OVERRIDE; + cef_menu_anchor_position_t anchor_position) override; + void CancelMenu() override; + CefRefPtr GetDisplay() override; + CefRect GetClientAreaBoundsInScreen() override; void SetDraggableRegions( - const std::vector& regions) OVERRIDE; - CefWindowHandle GetWindowHandle() OVERRIDE; - void SendKeyPress(int key_code, uint32 event_flags) OVERRIDE; - void SendMouseMove(int screen_x, int screen_y) OVERRIDE; + const std::vector& regions) override; + CefWindowHandle GetWindowHandle() override; + void SendKeyPress(int key_code, uint32 event_flags) override; + void SendMouseMove(int screen_x, int screen_y) override; void SendMouseEvents(cef_mouse_button_type_t button, bool mouse_down, - bool mouse_up) OVERRIDE; + bool mouse_up) override; void SetAccelerator(int command_id, int key_code, bool shift_pressed, bool ctrl_pressed, - bool alt_pressed) OVERRIDE; - void RemoveAccelerator(int command_id) OVERRIDE; - void RemoveAllAccelerators() OVERRIDE; + bool alt_pressed) override; + void RemoveAccelerator(int command_id) override; + void RemoveAllAccelerators() override; // CefPanel methods. - CefRefPtr AsWindow() OVERRIDE; - CefRefPtr SetToFillLayout() OVERRIDE; + CefRefPtr AsWindow() override; + CefRefPtr SetToFillLayout() override; CefRefPtr SetToBoxLayout( - const CefBoxLayoutSettings& settings) OVERRIDE; - CefRefPtr GetLayout() OVERRIDE; - void Layout() OVERRIDE; - void AddChildView(CefRefPtr view) OVERRIDE; - void AddChildViewAt(CefRefPtr view, int index) OVERRIDE; - void ReorderChildView(CefRefPtr view, int index) OVERRIDE; - void RemoveChildView(CefRefPtr view) OVERRIDE; - void RemoveAllChildViews() OVERRIDE; - size_t GetChildViewCount() OVERRIDE; - CefRefPtr GetChildViewAt(int index) OVERRIDE; + const CefBoxLayoutSettings& settings) override; + CefRefPtr GetLayout() override; + void Layout() override; + void AddChildView(CefRefPtr view) override; + void AddChildViewAt(CefRefPtr view, int index) override; + void ReorderChildView(CefRefPtr view, int index) override; + void RemoveChildView(CefRefPtr view) override; + void RemoveAllChildViews() override; + size_t GetChildViewCount() override; + CefRefPtr GetChildViewAt(int index) override; // CefView methods. - CefRefPtr AsBrowserView() OVERRIDE; - CefRefPtr AsButton() OVERRIDE; - CefRefPtr AsPanel() OVERRIDE; - CefRefPtr AsScrollView() OVERRIDE; - CefRefPtr AsTextfield() OVERRIDE; - CefString GetTypeString() OVERRIDE; - CefString ToString(bool include_children) OVERRIDE; - bool IsValid() OVERRIDE; - bool IsAttached() OVERRIDE; - bool IsSame(CefRefPtr that) OVERRIDE; - CefRefPtr GetDelegate() OVERRIDE; - CefRefPtr GetWindow() OVERRIDE; - int GetID() OVERRIDE; - void SetID(int id) OVERRIDE; - int GetGroupID() OVERRIDE; - void SetGroupID(int group_id) OVERRIDE; - CefRefPtr GetParentView() OVERRIDE; - CefRefPtr GetViewForID(int id) OVERRIDE; - void SetBounds(const CefRect& bounds) OVERRIDE; - CefRect GetBounds() OVERRIDE; - CefRect GetBoundsInScreen() OVERRIDE; - void SetSize(const CefSize& size) OVERRIDE; - CefSize GetSize() OVERRIDE; - void SetPosition(const CefPoint& position) OVERRIDE; - CefPoint GetPosition() OVERRIDE; - CefSize GetPreferredSize() OVERRIDE; - void SizeToPreferredSize() OVERRIDE; - CefSize GetMinimumSize() OVERRIDE; - CefSize GetMaximumSize() OVERRIDE; - int GetHeightForWidth(int width) OVERRIDE; - void InvalidateLayout() OVERRIDE; - void SetVisible(bool visible) OVERRIDE; - bool IsVisible() OVERRIDE; - bool IsDrawn() OVERRIDE; - void SetEnabled(bool enabled) OVERRIDE; - bool IsEnabled() OVERRIDE; - void SetFocusable(bool focusable) OVERRIDE; - bool IsFocusable() OVERRIDE; - bool IsAccessibilityFocusable() OVERRIDE; - void RequestFocus() OVERRIDE; - void SetBackgroundColor(cef_color_t color) OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool ConvertPointToScreen(CefPoint& point) OVERRIDE; - bool ConvertPointFromScreen(CefPoint& point) OVERRIDE; - bool ConvertPointToWindow(CefPoint& point) OVERRIDE; - bool ConvertPointFromWindow(CefPoint& point) OVERRIDE; - bool ConvertPointToView(CefRefPtr view, CefPoint& point) OVERRIDE; - bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; + CefRefPtr AsBrowserView() override; + CefRefPtr AsButton() override; + CefRefPtr AsPanel() override; + CefRefPtr AsScrollView() override; + CefRefPtr AsTextfield() override; + CefString GetTypeString() override; + CefString ToString(bool include_children) override; + bool IsValid() override; + bool IsAttached() override; + bool IsSame(CefRefPtr that) override; + CefRefPtr GetDelegate() override; + CefRefPtr GetWindow() override; + int GetID() override; + void SetID(int id) override; + int GetGroupID() override; + void SetGroupID(int group_id) override; + CefRefPtr GetParentView() override; + CefRefPtr GetViewForID(int id) override; + void SetBounds(const CefRect& bounds) override; + CefRect GetBounds() override; + CefRect GetBoundsInScreen() override; + void SetSize(const CefSize& size) override; + CefSize GetSize() override; + void SetPosition(const CefPoint& position) override; + CefPoint GetPosition() override; + CefSize GetPreferredSize() override; + void SizeToPreferredSize() override; + CefSize GetMinimumSize() override; + CefSize GetMaximumSize() override; + int GetHeightForWidth(int width) override; + void InvalidateLayout() override; + void SetVisible(bool visible) override; + bool IsVisible() override; + bool IsDrawn() override; + void SetEnabled(bool enabled) override; + bool IsEnabled() override; + void SetFocusable(bool focusable) override; + bool IsFocusable() override; + bool IsAccessibilityFocusable() override; + void RequestFocus() override; + void SetBackgroundColor(cef_color_t color) override; + cef_color_t GetBackgroundColor() override; + bool ConvertPointToScreen(CefPoint& point) override; + bool ConvertPointFromScreen(CefPoint& point) override; + bool ConvertPointToWindow(CefPoint& point) override; + bool ConvertPointFromWindow(CefPoint& point) override; + bool ConvertPointToView(CefRefPtr view, CefPoint& point) override; + bool ConvertPointFromView(CefRefPtr view, CefPoint& point) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/waitable_event_ctocpp.h b/libcef_dll/ctocpp/waitable_event_ctocpp.h index c0016d530..9894b52e7 100644 --- a/libcef_dll/ctocpp/waitable_event_ctocpp.h +++ b/libcef_dll/ctocpp/waitable_event_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f5669491fd2475dc9755a6e624a737312711d2d3$ +// $hash=097d4efa73574d6bb5edac6915296883a5ccdc29$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_WAITABLE_EVENT_CTOCPP_H_ @@ -35,11 +35,11 @@ class CefWaitableEventCToCpp virtual ~CefWaitableEventCToCpp(); // CefWaitableEvent methods. - void Reset() OVERRIDE; - void Signal() OVERRIDE; - bool IsSignaled() OVERRIDE; - void Wait() OVERRIDE; - bool TimedWait(int64 max_ms) OVERRIDE; + void Reset() override; + void Signal() override; + bool IsSignaled() override; + void Wait() override; + bool TimedWait(int64 max_ms) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_WAITABLE_EVENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/web_plugin_info_ctocpp.h b/libcef_dll/ctocpp/web_plugin_info_ctocpp.h index 64a055165..813f5941b 100644 --- a/libcef_dll/ctocpp/web_plugin_info_ctocpp.h +++ b/libcef_dll/ctocpp/web_plugin_info_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=012c4dec0875476356fe25c479539a4481a550c3$ +// $hash=2668b4409013efe51d31cfae5fce743530cdb994$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_CTOCPP_H_ @@ -37,10 +37,10 @@ class CefWebPluginInfoCToCpp virtual ~CefWebPluginInfoCToCpp(); // CefWebPluginInfo methods. - CefString GetName() OVERRIDE; - CefString GetPath() OVERRIDE; - CefString GetVersion() OVERRIDE; - CefString GetDescription() OVERRIDE; + CefString GetName() override; + CefString GetPath() override; + CefString GetVersion() override; + CefString GetDescription() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/x509cert_principal_ctocpp.h b/libcef_dll/ctocpp/x509cert_principal_ctocpp.h index 4bb4a8c6d..dd660403f 100644 --- a/libcef_dll/ctocpp/x509cert_principal_ctocpp.h +++ b/libcef_dll/ctocpp/x509cert_principal_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4bf290893db30f92b41162cf2cd47457f94b9940$ +// $hash=2f81d385c4a2501d7bca5ead500d66e2c8038942$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_X509CERT_PRINCIPAL_CTOCPP_H_ @@ -36,15 +36,15 @@ class CefX509CertPrincipalCToCpp virtual ~CefX509CertPrincipalCToCpp(); // CefX509CertPrincipal methods. - CefString GetDisplayName() OVERRIDE; - CefString GetCommonName() OVERRIDE; - CefString GetLocalityName() OVERRIDE; - CefString GetStateOrProvinceName() OVERRIDE; - CefString GetCountryName() OVERRIDE; - void GetStreetAddresses(std::vector& addresses) OVERRIDE; - void GetOrganizationNames(std::vector& names) OVERRIDE; - void GetOrganizationUnitNames(std::vector& names) OVERRIDE; - void GetDomainComponents(std::vector& components) OVERRIDE; + CefString GetDisplayName() override; + CefString GetCommonName() override; + CefString GetLocalityName() override; + CefString GetStateOrProvinceName() override; + CefString GetCountryName() override; + void GetStreetAddresses(std::vector& addresses) override; + void GetOrganizationNames(std::vector& names) override; + void GetOrganizationUnitNames(std::vector& names) override; + void GetDomainComponents(std::vector& components) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_X509CERT_PRINCIPAL_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/x509certificate_ctocpp.h b/libcef_dll/ctocpp/x509certificate_ctocpp.h index 1179cbd7c..45e9647b4 100644 --- a/libcef_dll/ctocpp/x509certificate_ctocpp.h +++ b/libcef_dll/ctocpp/x509certificate_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=96506815984e01c7670fededdc24ea0b5b6b4cee$ +// $hash=75aea2f12bf3761e97b99ebccc2f9cce6685fc70$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_X509CERTIFICATE_CTOCPP_H_ @@ -35,16 +35,16 @@ class CefX509CertificateCToCpp virtual ~CefX509CertificateCToCpp(); // CefX509Certificate methods. - CefRefPtr GetSubject() OVERRIDE; - CefRefPtr GetIssuer() OVERRIDE; - CefRefPtr GetSerialNumber() OVERRIDE; - CefTime GetValidStart() OVERRIDE; - CefTime GetValidExpiry() OVERRIDE; - CefRefPtr GetDEREncoded() OVERRIDE; - CefRefPtr GetPEMEncoded() OVERRIDE; - size_t GetIssuerChainSize() OVERRIDE; - void GetDEREncodedIssuerChain(IssuerChainBinaryList& chain) OVERRIDE; - void GetPEMEncodedIssuerChain(IssuerChainBinaryList& chain) OVERRIDE; + CefRefPtr GetSubject() override; + CefRefPtr GetIssuer() override; + CefRefPtr GetSerialNumber() override; + CefTime GetValidStart() override; + CefTime GetValidExpiry() override; + CefRefPtr GetDEREncoded() override; + CefRefPtr GetPEMEncoded() override; + size_t GetIssuerChainSize() override; + void GetDEREncodedIssuerChain(IssuerChainBinaryList& chain) override; + void GetPEMEncodedIssuerChain(IssuerChainBinaryList& chain) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_X509CERTIFICATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.h b/libcef_dll/ctocpp/xml_reader_ctocpp.h index 817c6834e..811d4c38f 100644 --- a/libcef_dll/ctocpp/xml_reader_ctocpp.h +++ b/libcef_dll/ctocpp/xml_reader_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ba444818045821388677e80af1f848b3938a7f1b$ +// $hash=d45a64d75c33d05c4fc07445cb809d6eedd9a597$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_XML_READER_CTOCPP_H_ @@ -34,37 +34,37 @@ class CefXmlReaderCToCpp : public CefCToCppRefCounted 0) { CancelPendingFor(nullptr, handler, true); @@ -167,12 +167,12 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { return false; } - void CancelPending(CefRefPtr browser, Handler* handler) OVERRIDE { + void CancelPending(CefRefPtr browser, Handler* handler) override { CancelPendingFor(browser, handler, true); } int GetPendingCount(CefRefPtr browser, - Handler* handler) OVERRIDE { + Handler* handler) override { CEF_REQUIRE_UI_THREAD(); if (browser_query_info_map_.empty()) @@ -187,7 +187,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { bool OnNextInfo(int browser_id, InfoIdType info_id, InfoObjectType info, - bool* remove) OVERRIDE { + bool* remove) override { if (info->handler == handler_) count_++; return true; @@ -221,16 +221,16 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { return 0; } - void OnBeforeClose(CefRefPtr browser) OVERRIDE { + void OnBeforeClose(CefRefPtr browser) override { CancelPendingFor(browser, nullptr, false); } - void OnRenderProcessTerminated(CefRefPtr browser) OVERRIDE { + void OnRenderProcessTerminated(CefRefPtr browser) override { CancelPendingFor(browser, nullptr, false); } void OnBeforeBrowse(CefRefPtr browser, - CefRefPtr frame) OVERRIDE { + CefRefPtr frame) override { if (frame->IsMain()) CancelPendingFor(browser, nullptr, false); } @@ -238,7 +238,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { bool OnProcessMessageReceived(CefRefPtr browser, CefRefPtr frame, CefProcessId source_process, - CefRefPtr message) OVERRIDE { + CefRefPtr message) override { CEF_REQUIRE_UI_THREAD(); const std::string& message_name = message->GetName(); @@ -359,7 +359,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { bool OnNextInfo(int browser_id, InfoIdType info_id, InfoObjectType info, - bool* remove) OVERRIDE { + bool* remove) override { *remove = removed_ = (always_remove_ || !info->persistent); return true; } @@ -503,7 +503,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { bool OnNextInfo(int browser_id, InfoIdType info_id, InfoObjectType info, - bool* remove) OVERRIDE { + bool* remove) override { if (!handler_ || info->handler == handler_) { *remove = true; router_->CancelQuery(info_id, info, notify_renderer_); @@ -542,7 +542,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide { bool OnNextInfo(int browser_id, InfoIdType info_id, InfoObjectType info, - bool* remove) OVERRIDE { + bool* remove) override { if (info->context_id == context_id_ && (request_id_ == kReservedId || info->request_id == request_id_)) { *remove = true; @@ -599,7 +599,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { if (name == config_.js_query_function) { if (arguments.size() != 1 || !arguments[0]->IsObject()) { exception = "Invalid arguments; expecting a single object"; @@ -707,7 +707,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { virtual ~CefMessageRouterRendererSideImpl() {} int GetPendingCount(CefRefPtr browser, - CefRefPtr context) OVERRIDE { + CefRefPtr context) override { CEF_REQUIRE_RENDERER_THREAD(); if (browser_request_info_map_.empty()) @@ -726,7 +726,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { bool OnNextInfo(int browser_id, InfoIdType info_id, InfoObjectType info, - bool* remove) OVERRIDE { + bool* remove) override { if (info_id.first == context_id_) count_++; return true; @@ -762,7 +762,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { void OnContextCreated(CefRefPtr browser, CefRefPtr frame, - CefRefPtr context) OVERRIDE { + CefRefPtr context) override { CEF_REQUIRE_RENDERER_THREAD(); // Register function handlers with the 'window' object. @@ -787,7 +787,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { void OnContextReleased(CefRefPtr browser, CefRefPtr frame, - CefRefPtr context) OVERRIDE { + CefRefPtr context) override { CEF_REQUIRE_RENDERER_THREAD(); // Get the context ID and remove the context from the map. @@ -801,7 +801,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { bool OnProcessMessageReceived(CefRefPtr browser, CefRefPtr frame, CefProcessId source_process, - CefRefPtr message) OVERRIDE { + CefRefPtr message) override { CEF_REQUIRE_RENDERER_THREAD(); const std::string& message_name = message->GetName(); @@ -870,7 +870,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { bool OnNextInfo(int browser_id, InfoIdType info_id, InfoObjectType info, - bool* remove) OVERRIDE { + bool* remove) override { *remove = removed_ = (always_remove_ || !info->persistent); return true; } @@ -955,7 +955,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide { bool OnNextInfo(int browser_id, InfoIdType info_id, InfoObjectType info, - bool* remove) OVERRIDE { + bool* remove) override { if (info_id.first == context_id_) { *remove = true; delete info; diff --git a/libcef_dll/wrapper/cef_resource_manager.cc b/libcef_dll/wrapper/cef_resource_manager.cc index 44c3f209f..e9521eefd 100644 --- a/libcef_dll/wrapper/cef_resource_manager.cc +++ b/libcef_dll/wrapper/cef_resource_manager.cc @@ -60,7 +60,7 @@ class ContentProvider : public CefResourceManager::Provider { DCHECK(!content.empty()); } - bool OnRequest(scoped_refptr request) OVERRIDE { + bool OnRequest(scoped_refptr request) override { CEF_REQUIRE_IO_THREAD(); const std::string& url = request->url(); @@ -105,7 +105,7 @@ class DirectoryProvider : public CefResourceManager::Provider { directory_path_ += PATH_SEP; } - bool OnRequest(scoped_refptr request) OVERRIDE { + bool OnRequest(scoped_refptr request) override { CEF_REQUIRE_IO_THREAD(); const std::string& url = request->url(); @@ -184,7 +184,7 @@ class ArchiveProvider : public CefResourceManager::Provider { url_path_ += '/'; } - bool OnRequest(scoped_refptr request) OVERRIDE { + bool OnRequest(scoped_refptr request) override { CEF_REQUIRE_IO_THREAD(); const std::string& url = request->url(); diff --git a/libcef_dll/wrapper/cef_zip_archive.cc b/libcef_dll/wrapper/cef_zip_archive.cc index 5120d9972..63a58e148 100644 --- a/libcef_dll/wrapper/cef_zip_archive.cc +++ b/libcef_dll/wrapper/cef_zip_archive.cc @@ -42,11 +42,11 @@ class CefZipFile : public CefZipArchive::File { } } - virtual const unsigned char* GetData() const OVERRIDE { return data_.get(); } + virtual const unsigned char* GetData() const override { return data_.get(); } - virtual size_t GetDataSize() const OVERRIDE { return data_size_; } + virtual size_t GetDataSize() const override { return data_size_; } - virtual CefRefPtr GetStreamReader() const OVERRIDE { + virtual CefRefPtr GetStreamReader() const override { CefRefPtr handler(new CefByteReadHandler( data_.get(), data_size_, const_cast(this))); return CefStreamReader::CreateForHandler(handler); diff --git a/tests/cefclient/browser/binding_test.cc b/tests/cefclient/browser/binding_test.cc index 297ebb394..3505eed15 100644 --- a/tests/cefclient/browser/binding_test.cc +++ b/tests/cefclient/browser/binding_test.cc @@ -28,7 +28,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { int64 query_id, const CefString& request, bool persistent, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { // Only handle messages from the test URL. const std::string& url = frame->GetURL(); if (!test_runner::IsTestURL(url, kTestUrlPath)) diff --git a/tests/cefclient/browser/browser_window.h b/tests/cefclient/browser/browser_window.h index a003ede51..81c925c6a 100644 --- a/tests/cefclient/browser/browser_window.h +++ b/tests/cefclient/browser/browser_window.h @@ -118,18 +118,18 @@ class BrowserWindow : public ClientHandler::Delegate { explicit BrowserWindow(Delegate* delegate); // ClientHandler::Delegate methods. - void OnBrowserCreated(CefRefPtr browser) OVERRIDE; - void OnBrowserClosing(CefRefPtr browser) OVERRIDE; - void OnBrowserClosed(CefRefPtr browser) OVERRIDE; - void OnSetAddress(const std::string& url) OVERRIDE; - void OnSetTitle(const std::string& title) OVERRIDE; - void OnSetFullscreen(bool fullscreen) OVERRIDE; - void OnAutoResize(const CefSize& new_size) OVERRIDE; + void OnBrowserCreated(CefRefPtr browser) override; + void OnBrowserClosing(CefRefPtr browser) override; + void OnBrowserClosed(CefRefPtr browser) override; + void OnSetAddress(const std::string& url) override; + void OnSetTitle(const std::string& title) override; + void OnSetFullscreen(bool fullscreen) override; + void OnAutoResize(const CefSize& new_size) override; void OnSetLoadingState(bool isLoading, bool canGoBack, - bool canGoForward) OVERRIDE; + bool canGoForward) override; void OnSetDraggableRegions( - const std::vector& regions) OVERRIDE; + const std::vector& regions) override; Delegate* delegate_; CefRefPtr browser_; diff --git a/tests/cefclient/browser/browser_window_osr_gtk.h b/tests/cefclient/browser/browser_window_osr_gtk.h index fa99c00f8..7802516d8 100644 --- a/tests/cefclient/browser/browser_window_osr_gtk.h +++ b/tests/cefclient/browser/browser_window_osr_gtk.h @@ -36,61 +36,61 @@ class BrowserWindowOsrGtk : public BrowserWindow, const CefRect& rect, const CefBrowserSettings& settings, CefRefPtr extra_info, - CefRefPtr request_context) OVERRIDE; + CefRefPtr request_context) override; void GetPopupConfig(CefWindowHandle temp_handle, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; + CefBrowserSettings& settings) override; void ShowPopup(ClientWindowHandle parent_handle, int x, int y, size_t width, - size_t height) OVERRIDE; - void Show() OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void SetFocus(bool focus) OVERRIDE; - void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; - float GetDeviceScaleFactor() const OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; + size_t height) override; + void Show() override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void SetFocus(bool focus) override; + void SetDeviceScaleFactor(float device_scale_factor) override; + float GetDeviceScaleFactor() const override; + ClientWindowHandle GetWindowHandle() const override; // ClientHandlerOsr::OsrDelegate methods. - void OnAfterCreated(CefRefPtr browser) OVERRIDE; - void OnBeforeClose(CefRefPtr browser) OVERRIDE; - bool GetRootScreenRect(CefRefPtr browser, CefRect& rect) OVERRIDE; - void GetViewRect(CefRefPtr browser, CefRect& rect) OVERRIDE; + void OnAfterCreated(CefRefPtr browser) override; + void OnBeforeClose(CefRefPtr browser) override; + bool GetRootScreenRect(CefRefPtr browser, CefRect& rect) override; + void GetViewRect(CefRefPtr browser, CefRect& rect) override; bool GetScreenPoint(CefRefPtr browser, int viewX, int viewY, int& screenX, - int& screenY) OVERRIDE; + int& screenY) override; bool GetScreenInfo(CefRefPtr browser, - CefScreenInfo& screen_info) OVERRIDE; - void OnPopupShow(CefRefPtr browser, bool show) OVERRIDE; - void OnPopupSize(CefRefPtr browser, const CefRect& rect) OVERRIDE; + CefScreenInfo& screen_info) override; + void OnPopupShow(CefRefPtr browser, bool show) override; + void OnPopupSize(CefRefPtr browser, const CefRect& rect) override; void OnPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const void* buffer, int width, - int height) OVERRIDE; + int height) override; void OnCursorChange(CefRefPtr browser, CefCursorHandle cursor, cef_cursor_type_t type, - const CefCursorInfo& custom_cursor_info) OVERRIDE; + const CefCursorInfo& custom_cursor_info) override; bool StartDragging(CefRefPtr browser, CefRefPtr drag_data, CefRenderHandler::DragOperationsMask allowed_ops, int x, - int y) OVERRIDE; + int y) override; void UpdateDragCursor(CefRefPtr browser, - CefRenderHandler::DragOperation operation) OVERRIDE; + CefRenderHandler::DragOperation operation) override; void OnImeCompositionRangeChanged( CefRefPtr browser, const CefRange& selection_range, - const CefRenderHandler::RectList& character_bounds) OVERRIDE; - void UpdateAccessibilityTree(CefRefPtr value) OVERRIDE; - void UpdateAccessibilityLocation(CefRefPtr value) OVERRIDE; + const CefRenderHandler::RectList& character_bounds) override; + void UpdateAccessibilityTree(CefRefPtr value) override; + void UpdateAccessibilityLocation(CefRefPtr value) override; private: ~BrowserWindowOsrGtk(); diff --git a/tests/cefclient/browser/browser_window_osr_mac.h b/tests/cefclient/browser/browser_window_osr_mac.h index 6211330c9..94be309df 100644 --- a/tests/cefclient/browser/browser_window_osr_mac.h +++ b/tests/cefclient/browser/browser_window_osr_mac.h @@ -33,62 +33,62 @@ class BrowserWindowOsrMac : public BrowserWindow, const CefRect& rect, const CefBrowserSettings& settings, CefRefPtr extra_info, - CefRefPtr request_context) OVERRIDE; + CefRefPtr request_context) override; void GetPopupConfig(CefWindowHandle temp_handle, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; + CefBrowserSettings& settings) override; void ShowPopup(ClientWindowHandle parent_handle, int x, int y, size_t width, - size_t height) OVERRIDE; - void Show() OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void SetFocus(bool focus) OVERRIDE; - void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; - float GetDeviceScaleFactor() const OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; + size_t height) override; + void Show() override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void SetFocus(bool focus) override; + void SetDeviceScaleFactor(float device_scale_factor) override; + float GetDeviceScaleFactor() const override; + ClientWindowHandle GetWindowHandle() const override; // ClientHandlerOsr::OsrDelegate methods. - void OnAfterCreated(CefRefPtr browser) OVERRIDE; - void OnBeforeClose(CefRefPtr browser) OVERRIDE; - bool GetRootScreenRect(CefRefPtr browser, CefRect& rect) OVERRIDE; - void GetViewRect(CefRefPtr browser, CefRect& rect) OVERRIDE; + void OnAfterCreated(CefRefPtr browser) override; + void OnBeforeClose(CefRefPtr browser) override; + bool GetRootScreenRect(CefRefPtr browser, CefRect& rect) override; + void GetViewRect(CefRefPtr browser, CefRect& rect) override; bool GetScreenPoint(CefRefPtr browser, int viewX, int viewY, int& screenX, - int& screenY) OVERRIDE; + int& screenY) override; bool GetScreenInfo(CefRefPtr browser, - CefScreenInfo& screen_info) OVERRIDE; - void OnPopupShow(CefRefPtr browser, bool show) OVERRIDE; - void OnPopupSize(CefRefPtr browser, const CefRect& rect) OVERRIDE; + CefScreenInfo& screen_info) override; + void OnPopupShow(CefRefPtr browser, bool show) override; + void OnPopupSize(CefRefPtr browser, const CefRect& rect) override; void OnPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const void* buffer, int width, - int height) OVERRIDE; + int height) override; void OnCursorChange(CefRefPtr browser, CefCursorHandle cursor, cef_cursor_type_t type, - const CefCursorInfo& custom_cursor_info) OVERRIDE; + const CefCursorInfo& custom_cursor_info) override; bool StartDragging(CefRefPtr browser, CefRefPtr drag_data, CefRenderHandler::DragOperationsMask allowed_ops, int x, - int y) OVERRIDE; + int y) override; void UpdateDragCursor(CefRefPtr browser, - CefRenderHandler::DragOperation operation) OVERRIDE; + CefRenderHandler::DragOperation operation) override; void OnImeCompositionRangeChanged( CefRefPtr browser, const CefRange& selection_range, - const CefRenderHandler::RectList& character_bounds) OVERRIDE; + const CefRenderHandler::RectList& character_bounds) override; - void UpdateAccessibilityTree(CefRefPtr value) OVERRIDE; - void UpdateAccessibilityLocation(CefRefPtr value) OVERRIDE; + void UpdateAccessibilityTree(CefRefPtr value) override; + void UpdateAccessibilityLocation(CefRefPtr value) override; private: scoped_ptr impl_; diff --git a/tests/cefclient/browser/browser_window_osr_win.h b/tests/cefclient/browser/browser_window_osr_win.h index 9cf302779..42ba2b385 100644 --- a/tests/cefclient/browser/browser_window_osr_win.h +++ b/tests/cefclient/browser/browser_window_osr_win.h @@ -28,30 +28,30 @@ class BrowserWindowOsrWin : public BrowserWindow, const CefRect& rect, const CefBrowserSettings& settings, CefRefPtr extra_info, - CefRefPtr request_context) OVERRIDE; + CefRefPtr request_context) override; void GetPopupConfig(CefWindowHandle temp_handle, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; + CefBrowserSettings& settings) override; void ShowPopup(ClientWindowHandle parent_handle, int x, int y, size_t width, - size_t height) OVERRIDE; - void Show() OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void SetFocus(bool focus) OVERRIDE; - void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; - float GetDeviceScaleFactor() const OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; + size_t height) override; + void Show() override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void SetFocus(bool focus) override; + void SetDeviceScaleFactor(float device_scale_factor) override; + float GetDeviceScaleFactor() const override; + ClientWindowHandle GetWindowHandle() const override; private: // ClienHandler::Delegate methods. - void OnBrowserClosed(CefRefPtr browser) OVERRIDE; + void OnBrowserClosed(CefRefPtr browser) override; // OsrWindowWin::Delegate methods. - void OnOsrNativeWindowCreated(HWND hwnd) OVERRIDE; + void OnOsrNativeWindowCreated(HWND hwnd) override; // The below members are only accessed on the main thread. scoped_refptr osr_window_; diff --git a/tests/cefclient/browser/browser_window_std_gtk.h b/tests/cefclient/browser/browser_window_std_gtk.h index 300f37fd1..80b5b2941 100644 --- a/tests/cefclient/browser/browser_window_std_gtk.h +++ b/tests/cefclient/browser/browser_window_std_gtk.h @@ -27,21 +27,21 @@ class BrowserWindowStdGtk : public BrowserWindow { const CefRect& rect, const CefBrowserSettings& settings, CefRefPtr extra_info, - CefRefPtr request_context) OVERRIDE; + CefRefPtr request_context) override; void GetPopupConfig(CefWindowHandle temp_handle, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; + CefBrowserSettings& settings) override; void ShowPopup(ClientWindowHandle parent_handle, int x, int y, size_t width, - size_t height) OVERRIDE; - void Show() OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void SetFocus(bool focus) OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; + size_t height) override; + void Show() override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void SetFocus(bool focus) override; + ClientWindowHandle GetWindowHandle() const override; private: XDisplay* xdisplay_; diff --git a/tests/cefclient/browser/browser_window_std_mac.h b/tests/cefclient/browser/browser_window_std_mac.h index 853b61678..c95556030 100644 --- a/tests/cefclient/browser/browser_window_std_mac.h +++ b/tests/cefclient/browser/browser_window_std_mac.h @@ -24,21 +24,21 @@ class BrowserWindowStdMac : public BrowserWindow { const CefRect& rect, const CefBrowserSettings& settings, CefRefPtr extra_info, - CefRefPtr request_context) OVERRIDE; + CefRefPtr request_context) override; void GetPopupConfig(CefWindowHandle temp_handle, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; + CefBrowserSettings& settings) override; void ShowPopup(ClientWindowHandle parent_handle, int x, int y, size_t width, - size_t height) OVERRIDE; - void Show() OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void SetFocus(bool focus) OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; + size_t height) override; + void Show() override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void SetFocus(bool focus) override; + ClientWindowHandle GetWindowHandle() const override; private: DISALLOW_COPY_AND_ASSIGN(BrowserWindowStdMac); diff --git a/tests/cefclient/browser/browser_window_std_win.h b/tests/cefclient/browser/browser_window_std_win.h index 8c8bef2bc..6048c4cf2 100644 --- a/tests/cefclient/browser/browser_window_std_win.h +++ b/tests/cefclient/browser/browser_window_std_win.h @@ -24,21 +24,21 @@ class BrowserWindowStdWin : public BrowserWindow { const CefRect& rect, const CefBrowserSettings& settings, CefRefPtr extra_info, - CefRefPtr request_context) OVERRIDE; + CefRefPtr request_context) override; void GetPopupConfig(CefWindowHandle temp_handle, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; + CefBrowserSettings& settings) override; void ShowPopup(ClientWindowHandle parent_handle, int x, int y, size_t width, - size_t height) OVERRIDE; - void Show() OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void SetFocus(bool focus) OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; + size_t height) override; + void Show() override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void SetFocus(bool focus) override; + ClientWindowHandle GetWindowHandle() const override; private: DISALLOW_COPY_AND_ASSIGN(BrowserWindowStdWin); diff --git a/tests/cefclient/browser/bytes_write_handler.h b/tests/cefclient/browser/bytes_write_handler.h index 26f9c7b0f..6907675a7 100644 --- a/tests/cefclient/browser/bytes_write_handler.h +++ b/tests/cefclient/browser/bytes_write_handler.h @@ -16,11 +16,11 @@ class BytesWriteHandler : public CefWriteHandler { explicit BytesWriteHandler(size_t grow); ~BytesWriteHandler(); - size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE; - int Seek(int64 offset, int whence) OVERRIDE; - int64 Tell() OVERRIDE; - int Flush() OVERRIDE; - bool MayBlock() OVERRIDE { return false; } + size_t Write(const void* ptr, size_t size, size_t n) override; + int Seek(int64 offset, int whence) override; + int64 Tell() override; + int Flush() override; + bool MayBlock() override { return false; } void* GetData() { return data_; } int64 GetDataSize() { return offset_; } diff --git a/tests/cefclient/browser/client_browser.cc b/tests/cefclient/browser/client_browser.cc index cffb1dc24..b2dd05748 100644 --- a/tests/cefclient/browser/client_browser.cc +++ b/tests/cefclient/browser/client_browser.cc @@ -19,7 +19,7 @@ class ClientBrowserDelegate : public ClientAppBrowser::Delegate { public: ClientBrowserDelegate() {} - void OnContextInitialized(CefRefPtr app) OVERRIDE { + void OnContextInitialized(CefRefPtr app) override { if (CefCrashReportingEnabled()) { // Set some crash keys for testing purposes. Keys must be defined in the // "crash_reporter.cfg" file. See cef_crash_util.h for details. @@ -42,7 +42,7 @@ class ClientBrowserDelegate : public ClientAppBrowser::Delegate { void OnBeforeCommandLineProcessing( CefRefPtr app, - CefRefPtr command_line) OVERRIDE { + CefRefPtr command_line) override { // Append Chromium command line parameters if touch events are enabled if (client::MainContext::Get()->TouchEventsEnabled()) command_line->AppendSwitchWithValue("touch-events", "enabled"); diff --git a/tests/cefclient/browser/client_handler.cc b/tests/cefclient/browser/client_handler.cc index f7a666bbd..0a8d2b5ee 100644 --- a/tests/cefclient/browser/client_handler.cc +++ b/tests/cefclient/browser/client_handler.cc @@ -230,7 +230,7 @@ class ClientDownloadImageCallback : public CefDownloadImageCallback { void OnDownloadImageFinished(const CefString& image_url, int http_status_code, - CefRefPtr image) OVERRIDE { + CefRefPtr image) override { if (image) client_handler_->NotifyFavicon(image); } diff --git a/tests/cefclient/browser/client_handler.h b/tests/cefclient/browser/client_handler.h index 35dde3702..b9d36f346 100644 --- a/tests/cefclient/browser/client_handler.h +++ b/tests/cefclient/browser/client_handler.h @@ -100,30 +100,30 @@ class ClientHandler : public CefClient, void DetachDelegate(); // CefClient methods - CefRefPtr GetContextMenuHandler() OVERRIDE { + CefRefPtr GetContextMenuHandler() override { return this; } - CefRefPtr GetDisplayHandler() OVERRIDE { return this; } - CefRefPtr GetDownloadHandler() OVERRIDE { return this; } - CefRefPtr GetDragHandler() OVERRIDE { return this; } - CefRefPtr GetFocusHandler() OVERRIDE { return this; } - CefRefPtr GetKeyboardHandler() OVERRIDE { return this; } - CefRefPtr GetLifeSpanHandler() OVERRIDE { return this; } - CefRefPtr GetLoadHandler() OVERRIDE { return this; } - CefRefPtr GetRequestHandler() OVERRIDE { return this; } + CefRefPtr GetDisplayHandler() override { return this; } + CefRefPtr GetDownloadHandler() override { return this; } + CefRefPtr GetDragHandler() override { return this; } + CefRefPtr GetFocusHandler() override { return this; } + CefRefPtr GetKeyboardHandler() override { return this; } + CefRefPtr GetLifeSpanHandler() override { return this; } + CefRefPtr GetLoadHandler() override { return this; } + CefRefPtr GetRequestHandler() override { return this; } bool OnProcessMessageReceived(CefRefPtr browser, CefRefPtr frame, CefProcessId source_process, - CefRefPtr message) OVERRIDE; + CefRefPtr message) override; #if defined(OS_LINUX) - CefRefPtr GetDialogHandler() OVERRIDE { + CefRefPtr GetDialogHandler() override { return dialog_handler_; } - CefRefPtr GetJSDialogHandler() OVERRIDE { + CefRefPtr GetJSDialogHandler() override { return dialog_handler_; } - CefRefPtr GetPrintHandler() OVERRIDE { + CefRefPtr GetPrintHandler() override { return print_handler_; } #endif @@ -132,62 +132,62 @@ class ClientHandler : public CefClient, void OnBeforeContextMenu(CefRefPtr browser, CefRefPtr frame, CefRefPtr params, - CefRefPtr model) OVERRIDE; + CefRefPtr model) override; bool OnContextMenuCommand(CefRefPtr browser, CefRefPtr frame, CefRefPtr params, int command_id, - EventFlags event_flags) OVERRIDE; + EventFlags event_flags) override; // CefDisplayHandler methods void OnAddressChange(CefRefPtr browser, CefRefPtr frame, - const CefString& url) OVERRIDE; + const CefString& url) override; void OnTitleChange(CefRefPtr browser, - const CefString& title) OVERRIDE; + const CefString& title) override; void OnFaviconURLChange(CefRefPtr browser, - const std::vector& icon_urls) OVERRIDE; + const std::vector& icon_urls) override; void OnFullscreenModeChange(CefRefPtr browser, - bool fullscreen) OVERRIDE; + bool fullscreen) override; bool OnConsoleMessage(CefRefPtr browser, cef_log_severity_t level, const CefString& message, const CefString& source, - int line) OVERRIDE; + int line) override; bool OnAutoResize(CefRefPtr browser, - const CefSize& new_size) OVERRIDE; + const CefSize& new_size) override; bool OnCursorChange(CefRefPtr browser, CefCursorHandle cursor, cef_cursor_type_t type, - const CefCursorInfo& custom_cursor_info) OVERRIDE; + const CefCursorInfo& custom_cursor_info) override; // CefDownloadHandler methods void OnBeforeDownload(CefRefPtr browser, CefRefPtr download_item, const CefString& suggested_name, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; void OnDownloadUpdated(CefRefPtr browser, CefRefPtr download_item, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; // CefDragHandler methods bool OnDragEnter(CefRefPtr browser, CefRefPtr dragData, - CefDragHandler::DragOperationsMask mask) OVERRIDE; + CefDragHandler::DragOperationsMask mask) override; void OnDraggableRegionsChanged( CefRefPtr browser, CefRefPtr frame, - const std::vector& regions) OVERRIDE; + const std::vector& regions) override; // CefFocusHandler methods - void OnTakeFocus(CefRefPtr browser, bool next) OVERRIDE; - bool OnSetFocus(CefRefPtr browser, FocusSource source) OVERRIDE; + void OnTakeFocus(CefRefPtr browser, bool next) override; + bool OnSetFocus(CefRefPtr browser, FocusSource source) override; // CefKeyboardHandler methods bool OnPreKeyEvent(CefRefPtr browser, const CefKeyEvent& event, CefEventHandle os_event, - bool* is_keyboard_shortcut) OVERRIDE; + bool* is_keyboard_shortcut) override; // CefLifeSpanHandler methods bool OnBeforePopup( @@ -202,34 +202,34 @@ class ClientHandler : public CefClient, CefRefPtr& client, CefBrowserSettings& settings, CefRefPtr& extra_info, - bool* no_javascript_access) OVERRIDE; - void OnAfterCreated(CefRefPtr browser) OVERRIDE; - bool DoClose(CefRefPtr browser) OVERRIDE; - void OnBeforeClose(CefRefPtr browser) OVERRIDE; + bool* no_javascript_access) override; + void OnAfterCreated(CefRefPtr browser) override; + bool DoClose(CefRefPtr browser) override; + void OnBeforeClose(CefRefPtr browser) override; // CefLoadHandler methods void OnLoadingStateChange(CefRefPtr browser, bool isLoading, bool canGoBack, - bool canGoForward) OVERRIDE; + bool canGoForward) override; void OnLoadError(CefRefPtr browser, CefRefPtr frame, ErrorCode errorCode, const CefString& errorText, - const CefString& failedUrl) OVERRIDE; + const CefString& failedUrl) override; // CefRequestHandler methods bool OnBeforeBrowse(CefRefPtr browser, CefRefPtr frame, CefRefPtr request, bool user_gesture, - bool is_redirect) OVERRIDE; + bool is_redirect) override; bool OnOpenURLFromTab( CefRefPtr browser, CefRefPtr frame, const CefString& target_url, CefRequestHandler::WindowOpenDisposition target_disposition, - bool user_gesture) OVERRIDE; + bool user_gesture) override; CefRefPtr GetResourceRequestHandler( CefRefPtr browser, CefRefPtr frame, @@ -237,7 +237,7 @@ class ClientHandler : public CefClient, bool is_navigation, bool is_download, const CefString& request_initiator, - bool& disable_default_handling) OVERRIDE; + bool& disable_default_handling) override; bool GetAuthCredentials(CefRefPtr browser, const CefString& origin_url, bool isProxy, @@ -245,46 +245,46 @@ class ClientHandler : public CefClient, int port, const CefString& realm, const CefString& scheme, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; bool OnQuotaRequest(CefRefPtr browser, const CefString& origin_url, int64 new_size, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; bool OnCertificateError(CefRefPtr browser, ErrorCode cert_error, const CefString& request_url, CefRefPtr ssl_info, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; bool OnSelectClientCertificate( CefRefPtr browser, bool isProxy, const CefString& host, int port, const X509CertificateList& certificates, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; void OnRenderProcessTerminated(CefRefPtr browser, - TerminationStatus status) OVERRIDE; - void OnDocumentAvailableInMainFrame(CefRefPtr browser) OVERRIDE; + TerminationStatus status) override; + void OnDocumentAvailableInMainFrame(CefRefPtr browser) override; // CefResourceRequestHandler methods cef_return_value_t OnBeforeResourceLoad( CefRefPtr browser, CefRefPtr frame, CefRefPtr request, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; CefRefPtr GetResourceHandler( CefRefPtr browser, CefRefPtr frame, - CefRefPtr request) OVERRIDE; + CefRefPtr request) override; CefRefPtr GetResourceResponseFilter( CefRefPtr browser, CefRefPtr frame, CefRefPtr request, - CefRefPtr response) OVERRIDE; + CefRefPtr response) override; void OnProtocolExecution(CefRefPtr browser, CefRefPtr frame, CefRefPtr request, - bool& allow_os_execution) OVERRIDE; + bool& allow_os_execution) override; // Returns the number of browsers currently using this handler. Can only be // called on the CEF UI thread. diff --git a/tests/cefclient/browser/client_handler_osr.h b/tests/cefclient/browser/client_handler_osr.h index 9dab6524a..2f31b05e2 100644 --- a/tests/cefclient/browser/client_handler_osr.h +++ b/tests/cefclient/browser/client_handler_osr.h @@ -84,58 +84,58 @@ class ClientHandlerOsr : public ClientHandler, void DetachOsrDelegate(); // CefClient methods. - CefRefPtr GetRenderHandler() OVERRIDE { return this; } - CefRefPtr GetAccessibilityHandler() OVERRIDE { + CefRefPtr GetRenderHandler() override { return this; } + CefRefPtr GetAccessibilityHandler() override { return this; } // CefLifeSpanHandler methods. - void OnAfterCreated(CefRefPtr browser) OVERRIDE; - void OnBeforeClose(CefRefPtr browser) OVERRIDE; + void OnAfterCreated(CefRefPtr browser) override; + void OnBeforeClose(CefRefPtr browser) override; // CefRenderHandler methods. - bool GetRootScreenRect(CefRefPtr browser, CefRect& rect) OVERRIDE; - void GetViewRect(CefRefPtr browser, CefRect& rect) OVERRIDE; + bool GetRootScreenRect(CefRefPtr browser, CefRect& rect) override; + void GetViewRect(CefRefPtr browser, CefRect& rect) override; bool GetScreenPoint(CefRefPtr browser, int viewX, int viewY, int& screenX, - int& screenY) OVERRIDE; + int& screenY) override; bool GetScreenInfo(CefRefPtr browser, - CefScreenInfo& screen_info) OVERRIDE; - void OnPopupShow(CefRefPtr browser, bool show) OVERRIDE; - void OnPopupSize(CefRefPtr browser, const CefRect& rect) OVERRIDE; + CefScreenInfo& screen_info) override; + void OnPopupShow(CefRefPtr browser, bool show) override; + void OnPopupSize(CefRefPtr browser, const CefRect& rect) override; void OnPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const void* buffer, int width, - int height) OVERRIDE; + int height) override; void OnAcceleratedPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, - void* share_handle) OVERRIDE; + void* share_handle) override; bool StartDragging(CefRefPtr browser, CefRefPtr drag_data, CefRenderHandler::DragOperationsMask allowed_ops, int x, - int y) OVERRIDE; + int y) override; void UpdateDragCursor(CefRefPtr browser, - CefRenderHandler::DragOperation operation) OVERRIDE; + CefRenderHandler::DragOperation operation) override; void OnImeCompositionRangeChanged( CefRefPtr browser, const CefRange& selection_range, - const CefRenderHandler::RectList& character_bounds) OVERRIDE; + const CefRenderHandler::RectList& character_bounds) override; // CefDisplayHandler methods. bool OnCursorChange(CefRefPtr browser, CefCursorHandle cursor, cef_cursor_type_t type, - const CefCursorInfo& custom_cursor_info) OVERRIDE; + const CefCursorInfo& custom_cursor_info) override; // CefAccessibilityHandler methods. - void OnAccessibilityTreeChange(CefRefPtr value) OVERRIDE; - void OnAccessibilityLocationChange(CefRefPtr value) OVERRIDE; + void OnAccessibilityTreeChange(CefRefPtr value) override; + void OnAccessibilityLocationChange(CefRefPtr value) override; private: // Only accessed on the UI thread. diff --git a/tests/cefclient/browser/dialog_handler_gtk.h b/tests/cefclient/browser/dialog_handler_gtk.h index c29d9f010..4c7994200 100644 --- a/tests/cefclient/browser/dialog_handler_gtk.h +++ b/tests/cefclient/browser/dialog_handler_gtk.h @@ -26,7 +26,7 @@ class ClientDialogHandlerGtk : public CefDialogHandler, const CefString& default_file_path, const std::vector& accept_filters, int selected_accept_filter, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; // CefJSDialogHandler methods. bool OnJSDialog(CefRefPtr browser, @@ -35,12 +35,12 @@ class ClientDialogHandlerGtk : public CefDialogHandler, const CefString& message_text, const CefString& default_prompt_text, CefRefPtr callback, - bool& suppress_message) OVERRIDE; + bool& suppress_message) override; bool OnBeforeUnloadDialog(CefRefPtr browser, const CefString& message_text, bool is_reload, - CefRefPtr callback) OVERRIDE; - void OnResetDialogState(CefRefPtr browser) OVERRIDE; + CefRefPtr callback) override; + void OnResetDialogState(CefRefPtr browser) override; private: struct OnFileDialogParams { diff --git a/tests/cefclient/browser/dialog_test.cc b/tests/cefclient/browser/dialog_test.cc index 030cedc4c..6e61ab1e4 100644 --- a/tests/cefclient/browser/dialog_test.cc +++ b/tests/cefclient/browser/dialog_test.cc @@ -46,7 +46,7 @@ class DialogCallback : public CefRunFileDialogCallback { virtual void OnFileDialogDismissed( int last_selected_filter, - const std::vector& file_paths) OVERRIDE { + const std::vector& file_paths) override { CEF_REQUIRE_UI_THREAD(); DCHECK(dialog_state_->pending_); @@ -100,7 +100,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { int64 query_id, const CefString& request, bool persistent, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { CEF_REQUIRE_UI_THREAD(); // Only handle messages from the test URL. diff --git a/tests/cefclient/browser/drm_test.cc b/tests/cefclient/browser/drm_test.cc index 75632bd96..e9f262394 100644 --- a/tests/cefclient/browser/drm_test.cc +++ b/tests/cefclient/browser/drm_test.cc @@ -30,7 +30,7 @@ class CdmCallback : public CefRegisterCdmCallback { : callback_(callback) {} void OnCdmRegistrationComplete(cef_cdm_registration_error_t result, - const CefString& error_message) OVERRIDE { + const CefString& error_message) override { if (result == CEF_CDM_REGISTRATION_ERROR_NONE) callback_->Success(""); else @@ -56,7 +56,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { int64 query_id, const CefString& request, bool persistent, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { // Only handle messages from the test URL. const std::string& url = frame->GetURL(); if (!test_runner::IsTestURL(url, kTestUrlPath)) diff --git a/tests/cefclient/browser/main_context_impl.h b/tests/cefclient/browser/main_context_impl.h index f0035a9cc..cdbba75a9 100644 --- a/tests/cefclient/browser/main_context_impl.h +++ b/tests/cefclient/browser/main_context_impl.h @@ -22,19 +22,19 @@ class MainContextImpl : public MainContext { bool terminate_when_all_windows_closed); // MainContext members. - std::string GetConsoleLogPath() OVERRIDE; - std::string GetDownloadPath(const std::string& file_name) OVERRIDE; - std::string GetAppWorkingDirectory() OVERRIDE; - std::string GetMainURL() OVERRIDE; - cef_color_t GetBackgroundColor() OVERRIDE; - bool UseChromeRuntime() OVERRIDE; - bool UseViews() OVERRIDE; - bool UseWindowlessRendering() OVERRIDE; - bool TouchEventsEnabled() OVERRIDE; - void PopulateSettings(CefSettings* settings) OVERRIDE; - void PopulateBrowserSettings(CefBrowserSettings* settings) OVERRIDE; - void PopulateOsrSettings(OsrRendererSettings* settings) OVERRIDE; - RootWindowManager* GetRootWindowManager() OVERRIDE; + std::string GetConsoleLogPath() override; + std::string GetDownloadPath(const std::string& file_name) override; + std::string GetAppWorkingDirectory() override; + std::string GetMainURL() override; + cef_color_t GetBackgroundColor() override; + bool UseChromeRuntime() override; + bool UseViews() override; + bool UseWindowlessRendering() override; + bool TouchEventsEnabled() override; + void PopulateSettings(CefSettings* settings) override; + void PopulateBrowserSettings(CefBrowserSettings* settings) override; + void PopulateOsrSettings(OsrRendererSettings* settings) override; + RootWindowManager* GetRootWindowManager() override; // Initialize CEF and associated main context state. This method must be // called on the same thread that created this object. diff --git a/tests/cefclient/browser/main_message_loop_multithreaded_gtk.h b/tests/cefclient/browser/main_message_loop_multithreaded_gtk.h index 51087fa83..7fbeaf890 100644 --- a/tests/cefclient/browser/main_message_loop_multithreaded_gtk.h +++ b/tests/cefclient/browser/main_message_loop_multithreaded_gtk.h @@ -26,10 +26,10 @@ class MainMessageLoopMultithreadedGtk : public MainMessageLoop { ~MainMessageLoopMultithreadedGtk(); // MainMessageLoop methods. - int Run() OVERRIDE; - void Quit() OVERRIDE; - void PostTask(CefRefPtr task) OVERRIDE; - bool RunsTasksOnCurrentThread() const OVERRIDE; + int Run() override; + void Quit() override; + void PostTask(CefRefPtr task) override; + bool RunsTasksOnCurrentThread() const override; private: static int TriggerRunTasks(void* self); diff --git a/tests/cefclient/browser/main_message_loop_multithreaded_win.h b/tests/cefclient/browser/main_message_loop_multithreaded_win.h index 7f045558e..61151060c 100644 --- a/tests/cefclient/browser/main_message_loop_multithreaded_win.h +++ b/tests/cefclient/browser/main_message_loop_multithreaded_win.h @@ -25,11 +25,11 @@ class MainMessageLoopMultithreadedWin : public MainMessageLoop { ~MainMessageLoopMultithreadedWin(); // MainMessageLoop methods. - int Run() OVERRIDE; - void Quit() OVERRIDE; - void PostTask(CefRefPtr task) OVERRIDE; - bool RunsTasksOnCurrentThread() const OVERRIDE; - void SetCurrentModelessDialog(HWND hWndDialog) OVERRIDE; + int Run() override; + void Quit() override; + void PostTask(CefRefPtr task) override; + bool RunsTasksOnCurrentThread() const override; + void SetCurrentModelessDialog(HWND hWndDialog) override; private: // Create the message window. diff --git a/tests/cefclient/browser/media_router_test.cc b/tests/cefclient/browser/media_router_test.cc index 4fec578ba..71b9f6de4 100644 --- a/tests/cefclient/browser/media_router_test.cc +++ b/tests/cefclient/browser/media_router_test.cc @@ -65,7 +65,7 @@ class MediaRouteCreateCallback : public CefMediaRouteCreateCallback { // CefMediaRouteCreateCallback method: void OnMediaRouteCreateFinished(RouteCreateResult result, const CefString& error, - CefRefPtr route) OVERRIDE { + CefRefPtr route) override { CEF_REQUIRE_UI_THREAD(); if (result == CEF_MRCR_OK) { CefRefPtr dict = CefDictionaryValue::Create(); @@ -98,7 +98,7 @@ class MediaObserver : public CefMediaObserver { pending_sink_query_id_(-1), pending_sink_callbacks_(0U) {} - ~MediaObserver() OVERRIDE { ClearSinkInfoMap(); } + ~MediaObserver() override { ClearSinkInfoMap(); } bool CreateRoute(const std::string& source_urn, const std::string& sink_id, @@ -157,7 +157,7 @@ class MediaObserver : public CefMediaObserver { : sink_id_(sink_id), callback_(callback) {} void OnMediaSinkDeviceInfo( - const CefMediaSinkDeviceInfo& device_info) OVERRIDE { + const CefMediaSinkDeviceInfo& device_info) override { CEF_REQUIRE_UI_THREAD(); callback_.Run(sink_id_, device_info); callback_.Reset(); @@ -172,7 +172,7 @@ class MediaObserver : public CefMediaObserver { }; // CefMediaObserver methods: - void OnSinks(const MediaSinkVector& sinks) OVERRIDE { + void OnSinks(const MediaSinkVector& sinks) override { CEF_REQUIRE_UI_THREAD(); ClearSinkInfoMap(); @@ -204,7 +204,7 @@ class MediaObserver : public CefMediaObserver { } } - void OnRoutes(const MediaRouteVector& routes) OVERRIDE { + void OnRoutes(const MediaRouteVector& routes) override { CEF_REQUIRE_UI_THREAD(); route_map_.clear(); @@ -231,7 +231,7 @@ class MediaObserver : public CefMediaObserver { } void OnRouteStateChanged(CefRefPtr route, - ConnectionState state) OVERRIDE { + ConnectionState state) override { CEF_REQUIRE_UI_THREAD(); CefRefPtr payload = CefDictionaryValue::Create(); @@ -242,7 +242,7 @@ class MediaObserver : public CefMediaObserver { void OnRouteMessageReceived(CefRefPtr route, const void* message, - size_t message_size) OVERRIDE { + size_t message_size) override { CEF_REQUIRE_UI_THREAD(); std::string message_str(static_cast(message), message_size); @@ -386,7 +386,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { int64 query_id, const CefString& request, bool persistent, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { CEF_REQUIRE_UI_THREAD(); // Only handle messages from the test URL. @@ -490,7 +490,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { void OnQueryCanceled(CefRefPtr browser, CefRefPtr frame, - int64 query_id) OVERRIDE { + int64 query_id) override { CEF_REQUIRE_UI_THREAD(); RemoveSubscription(browser->GetIdentifier(), query_id); } diff --git a/tests/cefclient/browser/osr_render_handler_win_d3d11.h b/tests/cefclient/browser/osr_render_handler_win_d3d11.h index a72b1ddab..cd0b8d503 100644 --- a/tests/cefclient/browser/osr_render_handler_win_d3d11.h +++ b/tests/cefclient/browser/osr_render_handler_win_d3d11.h @@ -16,7 +16,7 @@ class BrowserLayer : public d3d11::Layer { public: explicit BrowserLayer(const std::shared_ptr& device); - void render(const std::shared_ptr& ctx) OVERRIDE; + void render(const std::shared_ptr& ctx) override; void on_paint(void* share_handle); @@ -54,26 +54,26 @@ class OsrRenderHandlerWinD3D11 : public OsrRenderHandlerWin { // May fail if D3D11 cannot be initialized. bool Initialize(CefRefPtr browser, int width, int height); - void SetSpin(float spinX, float spinY) OVERRIDE; - void IncrementSpin(float spinDX, float spinDY) OVERRIDE; - bool IsOverPopupWidget(int x, int y) const OVERRIDE; - int GetPopupXOffset() const OVERRIDE; - int GetPopupYOffset() const OVERRIDE; - void OnPopupShow(CefRefPtr browser, bool show) OVERRIDE; - void OnPopupSize(CefRefPtr browser, const CefRect& rect) OVERRIDE; + void SetSpin(float spinX, float spinY) override; + void IncrementSpin(float spinDX, float spinDY) override; + bool IsOverPopupWidget(int x, int y) const override; + int GetPopupXOffset() const override; + int GetPopupYOffset() const override; + void OnPopupShow(CefRefPtr browser, bool show) override; + void OnPopupSize(CefRefPtr browser, const CefRect& rect) override; void OnPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const void* buffer, int width, - int height) OVERRIDE; + int height) override; void OnAcceleratedPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, - void* share_handle) OVERRIDE; + void* share_handle) override; private: - void Render() OVERRIDE; + void Render() override; uint64_t start_time_; std::shared_ptr device_; diff --git a/tests/cefclient/browser/osr_render_handler_win_gl.h b/tests/cefclient/browser/osr_render_handler_win_gl.h index 606bc70e3..88ff0920e 100644 --- a/tests/cefclient/browser/osr_render_handler_win_gl.h +++ b/tests/cefclient/browser/osr_render_handler_win_gl.h @@ -19,26 +19,26 @@ class OsrRenderHandlerWinGL : public OsrRenderHandlerWin { // Must be called immediately after object creation. void Initialize(CefRefPtr browser); - void SetSpin(float spinX, float spinY) OVERRIDE; - void IncrementSpin(float spinDX, float spinDY) OVERRIDE; - bool IsOverPopupWidget(int x, int y) const OVERRIDE; - int GetPopupXOffset() const OVERRIDE; - int GetPopupYOffset() const OVERRIDE; - void OnPopupShow(CefRefPtr browser, bool show) OVERRIDE; - void OnPopupSize(CefRefPtr browser, const CefRect& rect) OVERRIDE; + void SetSpin(float spinX, float spinY) override; + void IncrementSpin(float spinDX, float spinDY) override; + bool IsOverPopupWidget(int x, int y) const override; + int GetPopupXOffset() const override; + int GetPopupYOffset() const override; + void OnPopupShow(CefRefPtr browser, bool show) override; + void OnPopupSize(CefRefPtr browser, const CefRect& rect) override; void OnPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const void* buffer, int width, - int height) OVERRIDE; + int height) override; void OnAcceleratedPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, - void* share_handle) OVERRIDE; + void* share_handle) override; private: - void Render() OVERRIDE; + void Render() override; void EnableGL(); void DisableGL(); diff --git a/tests/cefclient/browser/osr_window_win.h b/tests/cefclient/browser/osr_window_win.h index aad0ed670..fdaaf9c7c 100644 --- a/tests/cefclient/browser/osr_window_win.h +++ b/tests/cefclient/browser/osr_window_win.h @@ -108,62 +108,62 @@ class OsrWindowWin void ApplyPopupOffset(int& x, int& y) const; // ClientHandlerOsr::OsrDelegate methods. - void OnAfterCreated(CefRefPtr browser) OVERRIDE; - void OnBeforeClose(CefRefPtr browser) OVERRIDE; - bool GetRootScreenRect(CefRefPtr browser, CefRect& rect) OVERRIDE; - void GetViewRect(CefRefPtr browser, CefRect& rect) OVERRIDE; + void OnAfterCreated(CefRefPtr browser) override; + void OnBeforeClose(CefRefPtr browser) override; + bool GetRootScreenRect(CefRefPtr browser, CefRect& rect) override; + void GetViewRect(CefRefPtr browser, CefRect& rect) override; bool GetScreenPoint(CefRefPtr browser, int viewX, int viewY, int& screenX, - int& screenY) OVERRIDE; + int& screenY) override; bool GetScreenInfo(CefRefPtr browser, - CefScreenInfo& screen_info) OVERRIDE; - void OnPopupShow(CefRefPtr browser, bool show) OVERRIDE; - void OnPopupSize(CefRefPtr browser, const CefRect& rect) OVERRIDE; + CefScreenInfo& screen_info) override; + void OnPopupShow(CefRefPtr browser, bool show) override; + void OnPopupSize(CefRefPtr browser, const CefRect& rect) override; void OnPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const void* buffer, int width, - int height) OVERRIDE; + int height) override; void OnAcceleratedPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, - void* share_handle) OVERRIDE; + void* share_handle) override; void OnCursorChange(CefRefPtr browser, CefCursorHandle cursor, cef_cursor_type_t type, - const CefCursorInfo& custom_cursor_info) OVERRIDE; + const CefCursorInfo& custom_cursor_info) override; bool StartDragging(CefRefPtr browser, CefRefPtr drag_data, CefRenderHandler::DragOperationsMask allowed_ops, int x, - int y) OVERRIDE; + int y) override; void UpdateDragCursor(CefRefPtr browser, - CefRenderHandler::DragOperation operation) OVERRIDE; + CefRenderHandler::DragOperation operation) override; void OnImeCompositionRangeChanged( CefRefPtr browser, const CefRange& selection_range, - const CefRenderHandler::RectList& character_bounds) OVERRIDE; + const CefRenderHandler::RectList& character_bounds) override; - void UpdateAccessibilityTree(CefRefPtr value) OVERRIDE; + void UpdateAccessibilityTree(CefRefPtr value) override; - void UpdateAccessibilityLocation(CefRefPtr value) OVERRIDE; + void UpdateAccessibilityLocation(CefRefPtr value) override; #if defined(CEF_USE_ATL) // OsrDragEvents methods. CefBrowserHost::DragOperationsMask OnDragEnter( CefRefPtr drag_data, CefMouseEvent ev, - CefBrowserHost::DragOperationsMask effect) OVERRIDE; + CefBrowserHost::DragOperationsMask effect) override; CefBrowserHost::DragOperationsMask OnDragOver( CefMouseEvent ev, - CefBrowserHost::DragOperationsMask effect) OVERRIDE; - void OnDragLeave() OVERRIDE; + CefBrowserHost::DragOperationsMask effect) override; + void OnDragLeave() override; CefBrowserHost::DragOperationsMask OnDrop( CefMouseEvent ev, - CefBrowserHost::DragOperationsMask effect) OVERRIDE; + CefBrowserHost::DragOperationsMask effect) override; #endif // defined(CEF_USE_ATL) void EnsureRenderHandler(); diff --git a/tests/cefclient/browser/preferences_test.cc b/tests/cefclient/browser/preferences_test.cc index 5659a8159..c202901fe 100644 --- a/tests/cefclient/browser/preferences_test.cc +++ b/tests/cefclient/browser/preferences_test.cc @@ -49,7 +49,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { int64 query_id, const CefString& request, bool persistent, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { CEF_REQUIRE_UI_THREAD(); // Only handle messages from the test URL. diff --git a/tests/cefclient/browser/print_handler_gtk.h b/tests/cefclient/browser/print_handler_gtk.h index 9aaa24879..6c38381f2 100644 --- a/tests/cefclient/browser/print_handler_gtk.h +++ b/tests/cefclient/browser/print_handler_gtk.h @@ -19,20 +19,20 @@ class ClientPrintHandlerGtk : public CefPrintHandler { virtual ~ClientPrintHandlerGtk(); // CefPrintHandler methods. - void OnPrintStart(CefRefPtr browser) OVERRIDE; + void OnPrintStart(CefRefPtr browser) override; void OnPrintSettings(CefRefPtr browser, CefRefPtr settings, - bool get_defaults) OVERRIDE; + bool get_defaults) override; bool OnPrintDialog(CefRefPtr browser, bool has_selection, - CefRefPtr callback) OVERRIDE; + CefRefPtr callback) override; bool OnPrintJob(CefRefPtr browser, const CefString& document_name, const CefString& pdf_file_path, - CefRefPtr callback) OVERRIDE; - void OnPrintReset(CefRefPtr browser) OVERRIDE; + CefRefPtr callback) override; + void OnPrintReset(CefRefPtr browser) override; CefSize GetPdfPaperSize(CefRefPtr browser, - int device_units_per_inch) OVERRIDE; + int device_units_per_inch) override; private: // Print handler. diff --git a/tests/cefclient/browser/response_filter_test.cc b/tests/cefclient/browser/response_filter_test.cc index 183250404..b8cab6e1c 100644 --- a/tests/cefclient/browser/response_filter_test.cc +++ b/tests/cefclient/browser/response_filter_test.cc @@ -36,7 +36,7 @@ class FindReplaceResponseFilter : public CefResponseFilter { replace_overflow_size_(0U), replace_count_(0U) {} - bool InitFilter() OVERRIDE { + bool InitFilter() override { const size_t find_size = sizeof(kFindString) - 1; const size_t replace_size = sizeof(kReplaceString) - 1; @@ -54,7 +54,7 @@ class FindReplaceResponseFilter : public CefResponseFilter { size_t& data_in_read, void* data_out, size_t data_out_size, - size_t& data_out_written) OVERRIDE { + size_t& data_out_written) override { DCHECK((data_in_size == 0U && !data_in) || (data_in_size > 0U && data_in)); DCHECK_EQ(data_in_read, 0U); DCHECK(data_out); @@ -176,14 +176,14 @@ class PassThruResponseFilter : public CefResponseFilter { public: PassThruResponseFilter() {} - bool InitFilter() OVERRIDE { return true; } + bool InitFilter() override { return true; } FilterStatus Filter(void* data_in, size_t data_in_size, size_t& data_in_read, void* data_out, size_t data_out_size, - size_t& data_out_written) OVERRIDE { + size_t& data_out_written) override { DCHECK((data_in_size == 0U && !data_in) || (data_in_size > 0U && data_in)); DCHECK_EQ(data_in_read, 0U); DCHECK(data_out); diff --git a/tests/cefclient/browser/root_window_gtk.h b/tests/cefclient/browser/root_window_gtk.h index 5c0aab4e2..0c6f18877 100644 --- a/tests/cefclient/browser/root_window_gtk.h +++ b/tests/cefclient/browser/root_window_gtk.h @@ -27,24 +27,24 @@ class RootWindowGtk : public RootWindow, public BrowserWindow::Delegate { // RootWindow methods. void Init(RootWindow::Delegate* delegate, const RootWindowConfig& config, - const CefBrowserSettings& settings) OVERRIDE; + const CefBrowserSettings& settings) override; void InitAsPopup(RootWindow::Delegate* delegate, bool with_controls, bool with_osr, const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; - void Show(ShowMode mode) OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void Close(bool force) OVERRIDE; - void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; - float GetDeviceScaleFactor() const OVERRIDE; - CefRefPtr GetBrowser() const OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; - bool WithWindowlessRendering() const OVERRIDE; - bool WithExtension() const OVERRIDE; + CefBrowserSettings& settings) override; + void Show(ShowMode mode) override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void Close(bool force) override; + void SetDeviceScaleFactor(float device_scale_factor) override; + float GetDeviceScaleFactor() const override; + CefRefPtr GetBrowser() const override; + ClientWindowHandle GetWindowHandle() const override; + bool WithWindowlessRendering() const override; + bool WithExtension() const override; private: void CreateBrowserWindow(const std::string& startup_url); @@ -52,18 +52,18 @@ class RootWindowGtk : public RootWindow, public BrowserWindow::Delegate { bool initially_hidden); // BrowserWindow::Delegate methods. - void OnBrowserCreated(CefRefPtr browser) OVERRIDE; - void OnBrowserWindowClosing() OVERRIDE; - void OnBrowserWindowDestroyed() OVERRIDE; - void OnSetAddress(const std::string& url) OVERRIDE; - void OnSetTitle(const std::string& title) OVERRIDE; - void OnSetFullscreen(bool fullscreen) OVERRIDE; - void OnAutoResize(const CefSize& new_size) OVERRIDE; + void OnBrowserCreated(CefRefPtr browser) override; + void OnBrowserWindowClosing() override; + void OnBrowserWindowDestroyed() override; + void OnSetAddress(const std::string& url) override; + void OnSetTitle(const std::string& title) override; + void OnSetFullscreen(bool fullscreen) override; + void OnAutoResize(const CefSize& new_size) override; void OnSetLoadingState(bool isLoading, bool canGoBack, - bool canGoForward) OVERRIDE; + bool canGoForward) override; void OnSetDraggableRegions( - const std::vector& regions) OVERRIDE; + const std::vector& regions) override; void NotifyMoveOrResizeStarted(); void NotifySetFocus(); diff --git a/tests/cefclient/browser/root_window_mac.h b/tests/cefclient/browser/root_window_mac.h index ddd76ba6d..0c0e689cf 100644 --- a/tests/cefclient/browser/root_window_mac.h +++ b/tests/cefclient/browser/root_window_mac.h @@ -31,37 +31,37 @@ class RootWindowMac : public RootWindow, public BrowserWindow::Delegate { // RootWindow methods. void Init(RootWindow::Delegate* delegate, const RootWindowConfig& config, - const CefBrowserSettings& settings) OVERRIDE; + const CefBrowserSettings& settings) override; void InitAsPopup(RootWindow::Delegate* delegate, bool with_controls, bool with_osr, const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; - void Show(ShowMode mode) OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void Close(bool force) OVERRIDE; - void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; - float GetDeviceScaleFactor() const OVERRIDE; - CefRefPtr GetBrowser() const OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; - bool WithWindowlessRendering() const OVERRIDE; - bool WithExtension() const OVERRIDE; + CefBrowserSettings& settings) override; + void Show(ShowMode mode) override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void Close(bool force) override; + void SetDeviceScaleFactor(float device_scale_factor) override; + float GetDeviceScaleFactor() const override; + CefRefPtr GetBrowser() const override; + ClientWindowHandle GetWindowHandle() const override; + bool WithWindowlessRendering() const override; + bool WithExtension() const override; // BrowserWindow::Delegate methods. - void OnBrowserCreated(CefRefPtr browser) OVERRIDE; - void OnBrowserWindowDestroyed() OVERRIDE; - void OnSetAddress(const std::string& url) OVERRIDE; - void OnSetTitle(const std::string& title) OVERRIDE; - void OnSetFullscreen(bool fullscreen) OVERRIDE; - void OnAutoResize(const CefSize& new_size) OVERRIDE; + void OnBrowserCreated(CefRefPtr browser) override; + void OnBrowserWindowDestroyed() override; + void OnSetAddress(const std::string& url) override; + void OnSetTitle(const std::string& title) override; + void OnSetFullscreen(bool fullscreen) override; + void OnAutoResize(const CefSize& new_size) override; void OnSetLoadingState(bool isLoading, bool canGoBack, - bool canGoForward) OVERRIDE; + bool canGoForward) override; void OnSetDraggableRegions( - const std::vector& regions) OVERRIDE; + const std::vector& regions) override; void OnNativeWindowClosed(); diff --git a/tests/cefclient/browser/root_window_manager.cc b/tests/cefclient/browser/root_window_manager.cc index f0ad7a5af..5946b97e8 100644 --- a/tests/cefclient/browser/root_window_manager.cc +++ b/tests/cefclient/browser/root_window_manager.cc @@ -31,7 +31,7 @@ class ClientRequestContextHandler : public CefRequestContextHandler, bool is_main_frame, const CefString& top_origin_url, CefRefPtr plugin_info, - PluginPolicy* plugin_policy) OVERRIDE { + PluginPolicy* plugin_policy) override { // Always allow the PDF plugin to load. if (*plugin_policy != PLUGIN_POLICY_ALLOW && mime_type == "application/pdf") { @@ -43,7 +43,7 @@ class ClientRequestContextHandler : public CefRequestContextHandler, } void OnRequestContextInitialized( - CefRefPtr request_context) OVERRIDE { + CefRefPtr request_context) override { CEF_REQUIRE_UI_THREAD(); CefRefPtr command_line = @@ -75,14 +75,14 @@ class ClientRequestContextHandler : public CefRequestContextHandler, } // CefExtensionHandler methods: - void OnExtensionLoaded(CefRefPtr extension) OVERRIDE { + void OnExtensionLoaded(CefRefPtr extension) override { CEF_REQUIRE_UI_THREAD(); MainContext::Get()->GetRootWindowManager()->AddExtension(extension); } CefRefPtr GetActiveBrowser(CefRefPtr extension, CefRefPtr browser, - bool include_incognito) OVERRIDE { + bool include_incognito) override { CEF_REQUIRE_UI_THREAD(); // Return the browser for the active/foreground window. diff --git a/tests/cefclient/browser/root_window_manager.h b/tests/cefclient/browser/root_window_manager.h index 18cf8dd10..aed17abe2 100644 --- a/tests/cefclient/browser/root_window_manager.h +++ b/tests/cefclient/browser/root_window_manager.h @@ -93,19 +93,19 @@ class RootWindowManager : public RootWindow::Delegate { // RootWindow::Delegate methods. CefRefPtr GetRequestContext( - RootWindow* root_window) OVERRIDE; - scoped_refptr GetImageCache() OVERRIDE; - void OnTest(RootWindow* root_window, int test_id) OVERRIDE; - void OnExit(RootWindow* root_window) OVERRIDE; - void OnRootWindowDestroyed(RootWindow* root_window) OVERRIDE; - void OnRootWindowActivated(RootWindow* root_window) OVERRIDE; + RootWindow* root_window) override; + scoped_refptr GetImageCache() override; + void OnTest(RootWindow* root_window, int test_id) override; + void OnExit(RootWindow* root_window) override; + void OnRootWindowDestroyed(RootWindow* root_window) override; + void OnRootWindowActivated(RootWindow* root_window) override; void OnBrowserCreated(RootWindow* root_window, - CefRefPtr browser) OVERRIDE; + CefRefPtr browser) override; void CreateExtensionWindow(CefRefPtr extension, const CefRect& source_bounds, CefRefPtr parent_window, const base::Closure& close_callback, - bool with_osr) OVERRIDE; + bool with_osr) override; void CleanupOnUIThread(); diff --git a/tests/cefclient/browser/root_window_views.h b/tests/cefclient/browser/root_window_views.h index 1c719c426..d21d2957f 100644 --- a/tests/cefclient/browser/root_window_views.h +++ b/tests/cefclient/browser/root_window_views.h @@ -29,62 +29,62 @@ class RootWindowViews : public RootWindow, // RootWindow methods: void Init(RootWindow::Delegate* delegate, const RootWindowConfig& config, - const CefBrowserSettings& settings) OVERRIDE; + const CefBrowserSettings& settings) override; void InitAsPopup(RootWindow::Delegate* delegate, bool with_controls, bool with_osr, const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; - void Show(ShowMode mode) OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void Close(bool force) OVERRIDE; - void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; - float GetDeviceScaleFactor() const OVERRIDE; - CefRefPtr GetBrowser() const OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; - bool WithWindowlessRendering() const OVERRIDE { return false; } - bool WithExtension() const OVERRIDE; - void OnExtensionsChanged(const ExtensionSet& extensions) OVERRIDE; + CefBrowserSettings& settings) override; + void Show(ShowMode mode) override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void Close(bool force) override; + void SetDeviceScaleFactor(float device_scale_factor) override; + float GetDeviceScaleFactor() const override; + CefRefPtr GetBrowser() const override; + ClientWindowHandle GetWindowHandle() const override; + bool WithWindowlessRendering() const override { return false; } + bool WithExtension() const override; + void OnExtensionsChanged(const ExtensionSet& extensions) override; // ViewsWindow::Delegate methods: - bool WithControls() OVERRIDE; - bool WithExtension() OVERRIDE; - bool InitiallyHidden() OVERRIDE; - CefRefPtr GetParentWindow() OVERRIDE; - CefRect GetWindowBounds() OVERRIDE; - scoped_refptr GetImageCache() OVERRIDE; - void OnViewsWindowCreated(CefRefPtr window) OVERRIDE; - void OnViewsWindowDestroyed(CefRefPtr window) OVERRIDE; - void OnViewsWindowActivated(CefRefPtr window) OVERRIDE; + bool WithControls() override; + bool WithExtension() override; + bool InitiallyHidden() override; + CefRefPtr GetParentWindow() override; + CefRect GetWindowBounds() override; + scoped_refptr GetImageCache() override; + void OnViewsWindowCreated(CefRefPtr window) override; + void OnViewsWindowDestroyed(CefRefPtr window) override; + void OnViewsWindowActivated(CefRefPtr window) override; ViewsWindow::Delegate* GetDelegateForPopup( - CefRefPtr client) OVERRIDE; + CefRefPtr client) override; void CreateExtensionWindow(CefRefPtr extension, const CefRect& source_bounds, CefRefPtr parent_window, - const base::Closure& close_callback) OVERRIDE; - void OnTest(int test_id) OVERRIDE; - void OnExit() OVERRIDE; + const base::Closure& close_callback) override; + void OnTest(int test_id) override; + void OnExit() override; protected: // ClientHandler::Delegate methods: - void OnBrowserCreated(CefRefPtr browser) OVERRIDE; - void OnBrowserClosing(CefRefPtr browser) OVERRIDE; - void OnBrowserClosed(CefRefPtr browser) OVERRIDE; - void OnSetAddress(const std::string& url) OVERRIDE; - void OnSetTitle(const std::string& title) OVERRIDE; - void OnSetFavicon(CefRefPtr image) OVERRIDE; - void OnSetFullscreen(bool fullscreen) OVERRIDE; - void OnAutoResize(const CefSize& new_size) OVERRIDE; + void OnBrowserCreated(CefRefPtr browser) override; + void OnBrowserClosing(CefRefPtr browser) override; + void OnBrowserClosed(CefRefPtr browser) override; + void OnSetAddress(const std::string& url) override; + void OnSetTitle(const std::string& title) override; + void OnSetFavicon(CefRefPtr image) override; + void OnSetFullscreen(bool fullscreen) override; + void OnAutoResize(const CefSize& new_size) override; void OnSetLoadingState(bool isLoading, bool canGoBack, - bool canGoForward) OVERRIDE; + bool canGoForward) override; void OnSetDraggableRegions( - const std::vector& regions) OVERRIDE; - void OnTakeFocus(bool next) OVERRIDE; - void OnBeforeContextMenu(CefRefPtr model) OVERRIDE; + const std::vector& regions) override; + void OnTakeFocus(bool next) override; + void OnBeforeContextMenu(CefRefPtr model) override; private: void CreateClientHandler(const std::string& url); diff --git a/tests/cefclient/browser/root_window_win.h b/tests/cefclient/browser/root_window_win.h index 153c38e3a..514562a57 100644 --- a/tests/cefclient/browser/root_window_win.h +++ b/tests/cefclient/browser/root_window_win.h @@ -30,24 +30,24 @@ class RootWindowWin : public RootWindow, public BrowserWindow::Delegate { // RootWindow methods. void Init(RootWindow::Delegate* delegate, const RootWindowConfig& config, - const CefBrowserSettings& settings) OVERRIDE; + const CefBrowserSettings& settings) override; void InitAsPopup(RootWindow::Delegate* delegate, bool with_controls, bool with_osr, const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr& client, - CefBrowserSettings& settings) OVERRIDE; - void Show(ShowMode mode) OVERRIDE; - void Hide() OVERRIDE; - void SetBounds(int x, int y, size_t width, size_t height) OVERRIDE; - void Close(bool force) OVERRIDE; - void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; - float GetDeviceScaleFactor() const OVERRIDE; - CefRefPtr GetBrowser() const OVERRIDE; - ClientWindowHandle GetWindowHandle() const OVERRIDE; - bool WithWindowlessRendering() const OVERRIDE; - bool WithExtension() const OVERRIDE; + CefBrowserSettings& settings) override; + void Show(ShowMode mode) override; + void Hide() override; + void SetBounds(int x, int y, size_t width, size_t height) override; + void Close(bool force) override; + void SetDeviceScaleFactor(float device_scale_factor) override; + float GetDeviceScaleFactor() const override; + CefRefPtr GetBrowser() const override; + ClientWindowHandle GetWindowHandle() const override; + bool WithWindowlessRendering() const override; + bool WithExtension() const override; private: void CreateBrowserWindow(const std::string& startup_url); @@ -95,17 +95,17 @@ class RootWindowWin : public RootWindow, public BrowserWindow::Delegate { void OnDestroyed(); // BrowserWindow::Delegate methods. - void OnBrowserCreated(CefRefPtr browser) OVERRIDE; - void OnBrowserWindowDestroyed() OVERRIDE; - void OnSetAddress(const std::string& url) OVERRIDE; - void OnSetTitle(const std::string& title) OVERRIDE; - void OnSetFullscreen(bool fullscreen) OVERRIDE; - void OnAutoResize(const CefSize& new_size) OVERRIDE; + void OnBrowserCreated(CefRefPtr browser) override; + void OnBrowserWindowDestroyed() override; + void OnSetAddress(const std::string& url) override; + void OnSetTitle(const std::string& title) override; + void OnSetFullscreen(bool fullscreen) override; + void OnAutoResize(const CefSize& new_size) override; void OnSetLoadingState(bool isLoading, bool canGoBack, - bool canGoForward) OVERRIDE; + bool canGoForward) override; void OnSetDraggableRegions( - const std::vector& regions) OVERRIDE; + const std::vector& regions) override; void NotifyDestroyedIfDone(); diff --git a/tests/cefclient/browser/scheme_test.cc b/tests/cefclient/browser/scheme_test.cc index c19806bea..0a781fd55 100644 --- a/tests/cefclient/browser/scheme_test.cc +++ b/tests/cefclient/browser/scheme_test.cc @@ -30,7 +30,7 @@ class ClientSchemeHandler : public CefResourceHandler { bool Open(CefRefPtr request, bool& handle_request, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { DCHECK(!CefCurrentlyOn(TID_UI) && !CefCurrentlyOn(TID_IO)); // The request will be continued or canceled based on the return value. @@ -79,7 +79,7 @@ class ClientSchemeHandler : public CefResourceHandler { void GetResponseHeaders(CefRefPtr response, int64& response_length, - CefString& redirectUrl) OVERRIDE { + CefString& redirectUrl) override { CEF_REQUIRE_IO_THREAD(); DCHECK(!data_.empty()); @@ -91,12 +91,12 @@ class ClientSchemeHandler : public CefResourceHandler { response_length = data_.length(); } - void Cancel() OVERRIDE { CEF_REQUIRE_IO_THREAD(); } + void Cancel() override { CEF_REQUIRE_IO_THREAD(); } bool Read(void* data_out, int bytes_to_read, int& bytes_read, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { DCHECK(!CefCurrentlyOn(TID_UI) && !CefCurrentlyOn(TID_IO)); bool has_data = false; @@ -134,7 +134,7 @@ class ClientSchemeHandlerFactory : public CefSchemeHandlerFactory { CefRefPtr Create(CefRefPtr browser, CefRefPtr frame, const CefString& scheme_name, - CefRefPtr request) OVERRIDE { + CefRefPtr request) override { CEF_REQUIRE_IO_THREAD(); return new ClientSchemeHandler(); } diff --git a/tests/cefclient/browser/server_test.cc b/tests/cefclient/browser/server_test.cc index ee3b922b5..574443922 100644 --- a/tests/cefclient/browser/server_test.cc +++ b/tests/cefclient/browser/server_test.cc @@ -225,7 +225,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { int64 query_id, const CefString& request, bool persistent, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { CEF_REQUIRE_UI_THREAD(); // Only handle messages from the test URL. diff --git a/tests/cefclient/browser/test_runner.cc b/tests/cefclient/browser/test_runner.cc index 68805e9fc..aaa459bb8 100644 --- a/tests/cefclient/browser/test_runner.cc +++ b/tests/cefclient/browser/test_runner.cc @@ -78,7 +78,7 @@ void RunGetSourceTest(CefRefPtr browser) { class Visitor : public CefStringVisitor { public: explicit Visitor(CefRefPtr browser) : browser_(browser) {} - virtual void Visit(const CefString& string) OVERRIDE { + virtual void Visit(const CefString& string) override { std::string source = StringReplace(string, "<", "<"); source = StringReplace(source, ">", ">"); std::stringstream ss; @@ -99,7 +99,7 @@ void RunGetTextTest(CefRefPtr browser) { class Visitor : public CefStringVisitor { public: explicit Visitor(CefRefPtr browser) : browser_(browser) {} - virtual void Visit(const CefString& string) OVERRIDE { + virtual void Visit(const CefString& string) override { std::string text = StringReplace(string, "<", "<"); text = StringReplace(text, ">", ">"); std::stringstream ss; @@ -181,7 +181,7 @@ void RunPluginInfoTest(CefRefPtr browser) { virtual bool Visit(CefRefPtr info, int count, - int total) OVERRIDE { + int total) override { html_ += "\n

Name: " + info->GetName().ToString() + "\n
Description: " + info->GetDescription().ToString() + "\n
Version: " + info->GetVersion().ToString() + @@ -223,7 +223,7 @@ class PromptHandler : public CefMessageRouterBrowserSide::Handler { int64 query_id, const CefString& request, bool persistent, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { // Parse |request| which takes the form "Prompt.[type]:[value]". const std::string& request_str = request; if (request_str.find(kPrompt) != 0) @@ -359,7 +359,7 @@ void EndTracing(CefRefPtr browser) { void OnFileDialogDismissed( int selected_accept_filter, - const std::vector& file_paths) OVERRIDE { + const std::vector& file_paths) override { if (!file_paths.empty()) { // File selected. Results in a call to OnEndTracingComplete. CefEndTracing(file_paths.front(), this); @@ -369,7 +369,7 @@ void EndTracing(CefRefPtr browser) { } } - void OnEndTracingComplete(const CefString& tracing_file) OVERRIDE { + void OnEndTracingComplete(const CefString& tracing_file) override { Alert(browser_, "File \"" + tracing_file.ToString() + "\" saved successfully."); } @@ -417,7 +417,7 @@ void PrintToPDF(CefRefPtr browser) { void OnFileDialogDismissed( int selected_accept_filter, - const std::vector& file_paths) OVERRIDE { + const std::vector& file_paths) override { if (!file_paths.empty()) { CefPdfPrintSettings settings; @@ -431,7 +431,7 @@ void PrintToPDF(CefRefPtr browser) { } } - void OnPdfPrintFinished(const CefString& path, bool ok) OVERRIDE { + void OnPdfPrintFinished(const CefString& path, bool ok) override { Alert(browser_, "File \"" + path.ToString() + "\" " + (ok ? "saved successfully." : "failed to save.")); } @@ -461,7 +461,7 @@ class RequestDumpResourceProvider : public CefResourceManager::Provider { DCHECK(!url.empty()); } - bool OnRequest(scoped_refptr request) OVERRIDE { + bool OnRequest(scoped_refptr request) override { CEF_REQUIRE_IO_THREAD(); const std::string& url = request->url(); @@ -495,7 +495,7 @@ class StringResourceProvider : public CefResourceManager::Provider { DCHECK(!pages.empty()); } - bool OnRequest(scoped_refptr request) OVERRIDE { + bool OnRequest(scoped_refptr request) override { CEF_REQUIRE_IO_THREAD(); const std::string& url = request->url(); diff --git a/tests/cefclient/browser/urlrequest_test.cc b/tests/cefclient/browser/urlrequest_test.cc index 7e3961385..e30744322 100644 --- a/tests/cefclient/browser/urlrequest_test.cc +++ b/tests/cefclient/browser/urlrequest_test.cc @@ -41,7 +41,7 @@ class RequestClient : public CefURLRequestClient { callback_.Reset(); } - void OnRequestComplete(CefRefPtr request) OVERRIDE { + void OnRequestComplete(CefRefPtr request) override { CEF_REQUIRE_UI_THREAD(); if (!callback_.is_null()) { callback_.Run(request->GetRequestError(), download_data_); @@ -51,15 +51,15 @@ class RequestClient : public CefURLRequestClient { void OnUploadProgress(CefRefPtr request, int64 current, - int64 total) OVERRIDE {} + int64 total) override {} void OnDownloadProgress(CefRefPtr request, int64 current, - int64 total) OVERRIDE {} + int64 total) override {} void OnDownloadData(CefRefPtr request, const void* data, - size_t data_length) OVERRIDE { + size_t data_length) override { CEF_REQUIRE_UI_THREAD(); download_data_ += std::string(static_cast(data), data_length); } @@ -69,7 +69,7 @@ class RequestClient : public CefURLRequestClient { int port, const CefString& realm, const CefString& scheme, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { return false; } @@ -94,7 +94,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { int64 query_id, const CefString& request, bool persistent, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { CEF_REQUIRE_UI_THREAD(); // Only handle messages from the test URL. diff --git a/tests/cefclient/browser/views_menu_bar.h b/tests/cefclient/browser/views_menu_bar.h index c0f0a933b..1e7f4e4aa 100644 --- a/tests/cefclient/browser/views_menu_bar.h +++ b/tests/cefclient/browser/views_menu_bar.h @@ -70,25 +70,25 @@ class ViewsMenuBar : public CefMenuButtonDelegate, public CefMenuModelDelegate { protected: // CefButtonDelegate methods: - void OnButtonPressed(CefRefPtr button) OVERRIDE {} + void OnButtonPressed(CefRefPtr button) override {} // CefMenuButtonDelegate methods: void OnMenuButtonPressed( CefRefPtr menu_button, const CefPoint& screen_point, - CefRefPtr button_pressed_lock) OVERRIDE; + CefRefPtr button_pressed_lock) override; // CefMenuModelDelegate methods: void ExecuteCommand(CefRefPtr menu_model, int command_id, - cef_event_flags_t event_flags) OVERRIDE; + cef_event_flags_t event_flags) override; void MouseOutsideMenu(CefRefPtr menu_model, - const CefPoint& screen_point) OVERRIDE; + const CefPoint& screen_point) override; void UnhandledOpenSubmenu(CefRefPtr menu_model, - bool is_rtl) OVERRIDE; + bool is_rtl) override; void UnhandledCloseSubmenu(CefRefPtr menu_model, - bool is_rtl) OVERRIDE; - void MenuClosed(CefRefPtr menu_model) OVERRIDE; + bool is_rtl) override; + void MenuClosed(CefRefPtr menu_model) override; private: // Creates the menu panel if it doesn't already exist. diff --git a/tests/cefclient/browser/views_window.h b/tests/cefclient/browser/views_window.h index da94f0c8a..a261a9af0 100644 --- a/tests/cefclient/browser/views_window.h +++ b/tests/cefclient/browser/views_window.h @@ -124,53 +124,53 @@ class ViewsWindow : public CefBrowserViewDelegate, CefRefPtr browser_view, const CefBrowserSettings& settings, CefRefPtr client, - bool is_devtools) OVERRIDE; + bool is_devtools) override; bool OnPopupBrowserViewCreated(CefRefPtr browser_view, CefRefPtr popup_browser_view, - bool is_devtools) OVERRIDE; + bool is_devtools) override; ChromeToolbarType GetChromeToolbarType() override; // CefButtonDelegate methods: - void OnButtonPressed(CefRefPtr button) OVERRIDE; + void OnButtonPressed(CefRefPtr button) override; // CefMenuButtonDelegate methods: void OnMenuButtonPressed( CefRefPtr menu_button, const CefPoint& screen_point, - CefRefPtr button_pressed_lock) OVERRIDE; + CefRefPtr button_pressed_lock) override; // CefMenuModelDelegate methods: void ExecuteCommand(CefRefPtr menu_model, int command_id, - cef_event_flags_t event_flags) OVERRIDE; + cef_event_flags_t event_flags) override; // CefTextfieldDelegate methods: bool OnKeyEvent(CefRefPtr textfield, - const CefKeyEvent& event) OVERRIDE; + const CefKeyEvent& event) override; // CefWindowDelegate methods: - void OnWindowCreated(CefRefPtr window) OVERRIDE; - void OnWindowDestroyed(CefRefPtr window) OVERRIDE; + void OnWindowCreated(CefRefPtr window) override; + void OnWindowDestroyed(CefRefPtr window) override; CefRefPtr GetParentWindow(CefRefPtr window, bool* is_menu, - bool* can_activate_menu) OVERRIDE; - bool IsFrameless(CefRefPtr window) OVERRIDE; - bool CanResize(CefRefPtr window) OVERRIDE; - bool CanClose(CefRefPtr window) OVERRIDE; - bool OnAccelerator(CefRefPtr window, int command_id) OVERRIDE; + bool* can_activate_menu) override; + bool IsFrameless(CefRefPtr window) override; + bool CanResize(CefRefPtr window) override; + bool CanClose(CefRefPtr window) override; + bool OnAccelerator(CefRefPtr window, int command_id) override; bool OnKeyEvent(CefRefPtr window, - const CefKeyEvent& event) OVERRIDE; + const CefKeyEvent& event) override; // CefViewDelegate methods: - CefSize GetMinimumSize(CefRefPtr view) OVERRIDE; - void OnFocus(CefRefPtr view) OVERRIDE; - void OnBlur(CefRefPtr view) OVERRIDE; - void OnWindowChanged(CefRefPtr view, bool added) OVERRIDE; + CefSize GetMinimumSize(CefRefPtr view) override; + void OnFocus(CefRefPtr view) override; + void OnBlur(CefRefPtr view) override; + void OnWindowChanged(CefRefPtr view, bool added) override; // ViewsMenuBar::Delegate methods: void MenuBarExecuteCommand(CefRefPtr menu_model, int command_id, - cef_event_flags_t event_flags) OVERRIDE; + cef_event_flags_t event_flags) override; private: // |delegate| is guaranteed to outlive this object. diff --git a/tests/cefclient/browser/window_test.cc b/tests/cefclient/browser/window_test.cc index cfe538289..6fa85aa34 100644 --- a/tests/cefclient/browser/window_test.cc +++ b/tests/cefclient/browser/window_test.cc @@ -67,7 +67,7 @@ class Handler : public CefMessageRouterBrowserSide::Handler { int64 query_id, const CefString& request, bool persistent, - CefRefPtr callback) OVERRIDE { + CefRefPtr callback) override { // Only handle messages from the test URL. const std::string& url = frame->GetURL(); if (!test_runner::IsTestURL(url, kTestUrlPath)) diff --git a/tests/cefclient/browser/window_test_runner_gtk.h b/tests/cefclient/browser/window_test_runner_gtk.h index c920fdb23..c699039c3 100644 --- a/tests/cefclient/browser/window_test_runner_gtk.h +++ b/tests/cefclient/browser/window_test_runner_gtk.h @@ -20,10 +20,10 @@ class WindowTestRunnerGtk : public WindowTestRunner { int x, int y, int width, - int height) OVERRIDE; - void Minimize(CefRefPtr browser) OVERRIDE; - void Maximize(CefRefPtr browser) OVERRIDE; - void Restore(CefRefPtr browser) OVERRIDE; + int height) override; + void Minimize(CefRefPtr browser) override; + void Maximize(CefRefPtr browser) override; + void Restore(CefRefPtr browser) override; }; } // namespace window_test diff --git a/tests/cefclient/browser/window_test_runner_mac.h b/tests/cefclient/browser/window_test_runner_mac.h index 199d04afa..aebae0e36 100644 --- a/tests/cefclient/browser/window_test_runner_mac.h +++ b/tests/cefclient/browser/window_test_runner_mac.h @@ -20,10 +20,10 @@ class WindowTestRunnerMac : public WindowTestRunner { int x, int y, int width, - int height) OVERRIDE; - void Minimize(CefRefPtr browser) OVERRIDE; - void Maximize(CefRefPtr browser) OVERRIDE; - void Restore(CefRefPtr browser) OVERRIDE; + int height) override; + void Minimize(CefRefPtr browser) override; + void Maximize(CefRefPtr browser) override; + void Restore(CefRefPtr browser) override; }; } // namespace window_test diff --git a/tests/cefclient/browser/window_test_runner_views.h b/tests/cefclient/browser/window_test_runner_views.h index 81334e499..6bc66b0da 100644 --- a/tests/cefclient/browser/window_test_runner_views.h +++ b/tests/cefclient/browser/window_test_runner_views.h @@ -20,10 +20,10 @@ class WindowTestRunnerViews : public WindowTestRunner { int x, int y, int width, - int height) OVERRIDE; - void Minimize(CefRefPtr browser) OVERRIDE; - void Maximize(CefRefPtr browser) OVERRIDE; - void Restore(CefRefPtr browser) OVERRIDE; + int height) override; + void Minimize(CefRefPtr browser) override; + void Maximize(CefRefPtr browser) override; + void Restore(CefRefPtr browser) override; }; } // namespace window_test diff --git a/tests/cefclient/browser/window_test_runner_win.h b/tests/cefclient/browser/window_test_runner_win.h index 14ff9f73b..d6e38ef6d 100644 --- a/tests/cefclient/browser/window_test_runner_win.h +++ b/tests/cefclient/browser/window_test_runner_win.h @@ -21,10 +21,10 @@ class WindowTestRunnerWin : public WindowTestRunner { int x, int y, int width, - int height) OVERRIDE; - void Minimize(CefRefPtr browser) OVERRIDE; - void Maximize(CefRefPtr browser) OVERRIDE; - void Restore(CefRefPtr browser) OVERRIDE; + int height) override; + void Minimize(CefRefPtr browser) override; + void Maximize(CefRefPtr browser) override; + void Restore(CefRefPtr browser) override; }; } // namespace window_test diff --git a/tests/cefclient/cefclient_gtk.cc b/tests/cefclient/cefclient_gtk.cc index 4e81c1903..0ef64e6cd 100644 --- a/tests/cefclient/cefclient_gtk.cc +++ b/tests/cefclient/cefclient_gtk.cc @@ -101,7 +101,7 @@ int RunMain(int argc, char* argv[]) { // Force the app to use OpenGL <= 3.1 when off-screen rendering is enabled. // TODO(cefclient): Rewrite OSRRenderer to use shaders instead of the // fixed-function pipeline which was removed in OpenGL 3.2 (back in 2009). - setenv("MESA_GL_VERSION_OVERRIDE", "3.1", /*overwrite=*/0); + setenv("MESA_GL_VERSION_override", "3.1", /*overwrite=*/0); } // Create the main message loop object. diff --git a/tests/cefclient/renderer/client_renderer.cc b/tests/cefclient/renderer/client_renderer.cc index ed32aaff5..106a612ba 100644 --- a/tests/cefclient/renderer/client_renderer.cc +++ b/tests/cefclient/renderer/client_renderer.cc @@ -24,7 +24,7 @@ class ClientRenderDelegate : public ClientAppRenderer::Delegate { public: ClientRenderDelegate() : last_node_is_editable_(false) {} - void OnWebKitInitialized(CefRefPtr app) OVERRIDE { + void OnWebKitInitialized(CefRefPtr app) override { if (CefCrashReportingEnabled()) { // Set some crash keys for testing purposes. Keys must be defined in the // "crash_reporter.cfg" file. See cef_crash_util.h for details. @@ -44,21 +44,21 @@ class ClientRenderDelegate : public ClientAppRenderer::Delegate { void OnContextCreated(CefRefPtr app, CefRefPtr browser, CefRefPtr frame, - CefRefPtr context) OVERRIDE { + CefRefPtr context) override { message_router_->OnContextCreated(browser, frame, context); } void OnContextReleased(CefRefPtr app, CefRefPtr browser, CefRefPtr frame, - CefRefPtr context) OVERRIDE { + CefRefPtr context) override { message_router_->OnContextReleased(browser, frame, context); } void OnFocusedNodeChanged(CefRefPtr app, CefRefPtr browser, CefRefPtr frame, - CefRefPtr node) OVERRIDE { + CefRefPtr node) override { bool is_editable = (node.get() && node->IsEditable()); if (is_editable != last_node_is_editable_) { // Notify the browser of the change in focused element type. @@ -74,7 +74,7 @@ class ClientRenderDelegate : public ClientAppRenderer::Delegate { CefRefPtr browser, CefRefPtr frame, CefProcessId source_process, - CefRefPtr message) OVERRIDE { + CefRefPtr message) override { return message_router_->OnProcessMessageReceived(browser, frame, source_process, message); } diff --git a/tests/cefclient/renderer/performance_test.cc b/tests/cefclient/renderer/performance_test.cc index 64fcaaa78..b88e3bdb4 100644 --- a/tests/cefclient/renderer/performance_test.cc +++ b/tests/cefclient/renderer/performance_test.cc @@ -35,7 +35,7 @@ class V8Handler : public CefV8Handler { CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { if (name == kRunPerfTest) { if (arguments.size() == 1 && arguments[0]->IsString()) { // Run the specified perf test. @@ -133,7 +133,7 @@ class RenderDelegate : public ClientAppRenderer::Delegate { virtual void OnContextCreated(CefRefPtr app, CefRefPtr browser, CefRefPtr frame, - CefRefPtr context) OVERRIDE { + CefRefPtr context) override { CefRefPtr object = context->GetGlobal(); CefRefPtr handler = new V8Handler(); diff --git a/tests/cefclient/renderer/performance_test_tests.cc b/tests/cefclient/renderer/performance_test_tests.cc index 010fcf9b7..43e3879eb 100644 --- a/tests/cefclient/renderer/performance_test_tests.cc +++ b/tests/cefclient/renderer/performance_test_tests.cc @@ -93,7 +93,7 @@ PERF_TEST_FUNC(V8FunctionCreate) { CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { return false; } IMPLEMENT_REFCOUNTING(Handler); @@ -115,7 +115,7 @@ PERF_TEST_FUNC(V8FunctionExecute) { CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } IMPLEMENT_REFCOUNTING(Handler); @@ -140,7 +140,7 @@ PERF_TEST_FUNC(V8FunctionExecuteWithContext) { CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } IMPLEMENT_REFCOUNTING(Handler); @@ -171,13 +171,13 @@ PERF_TEST_FUNC(V8ObjectCreateWithAccessor) { virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } IMPLEMENT_REFCOUNTING(Accessor); @@ -197,25 +197,25 @@ PERF_TEST_FUNC(V8ObjectCreateWithInterceptor) { virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } virtual bool Get(int index, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } virtual bool Set(int index, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } IMPLEMENT_REFCOUNTING(Interceptor); @@ -257,13 +257,13 @@ PERF_TEST_FUNC(V8ObjectSetValueWithAccessor) { virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { val_ = value; return true; } @@ -291,14 +291,14 @@ PERF_TEST_FUNC(V8ObjectGetValueWithAccessor) { virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { retval = val_; return true; } virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { return true; } CefRefPtr val_; diff --git a/tests/cefsimple/simple_app.cc b/tests/cefsimple/simple_app.cc index 2784bdb75..189a1d584 100644 --- a/tests/cefsimple/simple_app.cc +++ b/tests/cefsimple/simple_app.cc @@ -22,7 +22,7 @@ class SimpleWindowDelegate : public CefWindowDelegate { explicit SimpleWindowDelegate(CefRefPtr browser_view) : browser_view_(browser_view) {} - void OnWindowCreated(CefRefPtr window) OVERRIDE { + void OnWindowCreated(CefRefPtr window) override { // Add the browser view and show the window. window->AddChildView(browser_view_); window->Show(); @@ -31,11 +31,11 @@ class SimpleWindowDelegate : public CefWindowDelegate { browser_view_->RequestFocus(); } - void OnWindowDestroyed(CefRefPtr window) OVERRIDE { + void OnWindowDestroyed(CefRefPtr window) override { browser_view_ = nullptr; } - bool CanClose(CefRefPtr window) OVERRIDE { + bool CanClose(CefRefPtr window) override { // Allow the window to close if the browser says it's OK. CefRefPtr browser = browser_view_->GetBrowser(); if (browser) @@ -43,7 +43,7 @@ class SimpleWindowDelegate : public CefWindowDelegate { return true; } - CefSize GetPreferredSize(CefRefPtr view) OVERRIDE { + CefSize GetPreferredSize(CefRefPtr view) override { return CefSize(800, 600); } @@ -60,7 +60,7 @@ class SimpleBrowserViewDelegate : public CefBrowserViewDelegate { bool OnPopupBrowserViewCreated(CefRefPtr browser_view, CefRefPtr popup_browser_view, - bool is_devtools) OVERRIDE { + bool is_devtools) override { // Create a new top-level Window for the popup. It will show itself after // creation. CefWindow::CreateTopLevelWindow( diff --git a/tests/cefsimple/simple_app.h b/tests/cefsimple/simple_app.h index ab32391cc..81afd54b2 100644 --- a/tests/cefsimple/simple_app.h +++ b/tests/cefsimple/simple_app.h @@ -13,13 +13,13 @@ class SimpleApp : public CefApp, public CefBrowserProcessHandler { SimpleApp(); // CefApp methods: - CefRefPtr GetBrowserProcessHandler() OVERRIDE { + CefRefPtr GetBrowserProcessHandler() override { return this; } // CefBrowserProcessHandler methods: - void OnContextInitialized() OVERRIDE; - CefRefPtr GetDefaultClient() OVERRIDE; + void OnContextInitialized() override; + CefRefPtr GetDefaultClient() override; private: // Include the default reference counting implementation. diff --git a/tests/cefsimple/simple_handler.h b/tests/cefsimple/simple_handler.h index 4ca57339a..c53421ec0 100644 --- a/tests/cefsimple/simple_handler.h +++ b/tests/cefsimple/simple_handler.h @@ -21,29 +21,29 @@ class SimpleHandler : public CefClient, static SimpleHandler* GetInstance(); // CefClient methods: - virtual CefRefPtr GetDisplayHandler() OVERRIDE { + virtual CefRefPtr GetDisplayHandler() override { return this; } - virtual CefRefPtr GetLifeSpanHandler() OVERRIDE { + virtual CefRefPtr GetLifeSpanHandler() override { return this; } - virtual CefRefPtr GetLoadHandler() OVERRIDE { return this; } + virtual CefRefPtr GetLoadHandler() override { return this; } // CefDisplayHandler methods: virtual void OnTitleChange(CefRefPtr browser, - const CefString& title) OVERRIDE; + const CefString& title) override; // CefLifeSpanHandler methods: - virtual void OnAfterCreated(CefRefPtr browser) OVERRIDE; - virtual bool DoClose(CefRefPtr browser) OVERRIDE; - virtual void OnBeforeClose(CefRefPtr browser) OVERRIDE; + virtual void OnAfterCreated(CefRefPtr browser) override; + virtual bool DoClose(CefRefPtr browser) override; + virtual void OnBeforeClose(CefRefPtr browser) override; // CefLoadHandler methods: virtual void OnLoadError(CefRefPtr browser, CefRefPtr frame, ErrorCode errorCode, const CefString& errorText, - const CefString& failedUrl) OVERRIDE; + const CefString& failedUrl) override; // Request that all existing browser windows close. void CloseAllBrowsers(bool force_close); diff --git a/tests/ceftests/v8_unittest.cc b/tests/ceftests/v8_unittest.cc index 509243ade..2273c39a9 100644 --- a/tests/ceftests/v8_unittest.cc +++ b/tests/ceftests/v8_unittest.cc @@ -997,7 +997,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { EXPECT_TRUE(name.ToString() == kName1 || name.ToString() == kName2 || name.ToString() == kName3); @@ -1024,7 +1024,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Get(int index, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { EXPECT_TRUE(index >= 0 && index < 3); EXPECT_TRUE(object.get()); @@ -1042,7 +1042,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { EXPECT_TRUE(name.ToString() == kName1 || name.ToString() == kName2 || name.ToString() == kName3); @@ -1069,7 +1069,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Set(int index, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { EXPECT_TRUE(index >= 0 && index < 3); EXPECT_TRUE(object.get()); @@ -1199,7 +1199,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { got_get_byname_.yes(); StringMap::iterator it = string_map_.find(name.ToString()); if (it != string_map_.end()) { @@ -1211,7 +1211,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Get(int index, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { got_get_byindex_.yes(); IntMap::iterator it = int_map_.find(index); if (it != int_map_.end()) { @@ -1223,7 +1223,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { EXPECT_TRUE(value->IsInt()); got_set_byname_.yes(); string_map_[name.ToString()] = value->GetIntValue(); @@ -1233,7 +1233,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Set(int index, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { EXPECT_TRUE(value->IsInt()); got_set_byindex_.yes(); int_map_[index] = value->GetIntValue(); @@ -1337,7 +1337,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { got_get_byname_.yes(); exception = kGetByNameException; return true; @@ -1346,7 +1346,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Get(int index, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { got_get_byindex_.yes(); exception = kGetByIndexException; return true; @@ -1355,7 +1355,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { got_set_byname_.yes(); exception = kSetByNameException; return true; @@ -1364,7 +1364,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Set(int index, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { got_set_byindex_.yes(); exception = kSetByIndexException; return true; @@ -1453,7 +1453,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { EXPECT_FALSE(retval.get()); got_get_byname_.yes(); if (name.ToString() == kInterceptorName) { @@ -1465,7 +1465,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Get(int index, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { got_get_byindex_.yes(); return true; } @@ -1473,7 +1473,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { got_set_byname_.yes(); return true; } @@ -1481,7 +1481,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Set(int index, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { got_set_byindex_.yes(); return true; } @@ -1500,7 +1500,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Get(const CefString& name, const CefRefPtr object, CefRefPtr& retval, - CefString& exception) OVERRIDE { + CefString& exception) override { got_get_.yes(); retval = CefV8Value::CreateInt(kAccessorValue); return true; @@ -1509,7 +1509,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate, virtual bool Set(const CefString& name, const CefRefPtr object, const CefRefPtr value, - CefString& exception) OVERRIDE { + CefString& exception) override { got_set_.yes(); return true; } diff --git a/tests/shared/browser/client_app_browser.h b/tests/shared/browser/client_app_browser.h index ba09765be..1b526948f 100644 --- a/tests/shared/browser/client_app_browser.h +++ b/tests/shared/browser/client_app_browser.h @@ -53,16 +53,16 @@ class ClientAppBrowser : public ClientApp, public CefBrowserProcessHandler { // CefApp methods. void OnBeforeCommandLineProcessing( const CefString& process_type, - CefRefPtr command_line) OVERRIDE; - CefRefPtr GetBrowserProcessHandler() OVERRIDE { + CefRefPtr command_line) override; + CefRefPtr GetBrowserProcessHandler() override { return this; } // CefBrowserProcessHandler methods. - void OnContextInitialized() OVERRIDE; + void OnContextInitialized() override; void OnBeforeChildProcessLaunch( - CefRefPtr command_line) OVERRIDE; - void OnScheduleMessagePumpWork(int64 delay) OVERRIDE; + CefRefPtr command_line) override; + void OnScheduleMessagePumpWork(int64 delay) override; // Set of supported Delegates. DelegateSet delegates_; diff --git a/tests/shared/browser/main_message_loop_external_pump_linux.cc b/tests/shared/browser/main_message_loop_external_pump_linux.cc index 1afe8feb0..44df563c8 100644 --- a/tests/shared/browser/main_message_loop_external_pump_linux.cc +++ b/tests/shared/browser/main_message_loop_external_pump_linux.cc @@ -57,11 +57,11 @@ class MainMessageLoopExternalPumpLinux : public MainMessageLoopExternalPump { ~MainMessageLoopExternalPumpLinux(); // MainMessageLoopStd methods: - void Quit() OVERRIDE; - int Run() OVERRIDE; + void Quit() override; + int Run() override; // MainMessageLoopExternalPump methods: - void OnScheduleMessagePumpWork(int64 delay_ms) OVERRIDE; + void OnScheduleMessagePumpWork(int64 delay_ms) override; // Internal methods used for processing the pump callbacks. They are public // for simplicity but should not be used directly. HandlePrepare is called @@ -75,9 +75,9 @@ class MainMessageLoopExternalPumpLinux : public MainMessageLoopExternalPump { protected: // MainMessageLoopExternalPump methods: - void SetTimer(int64 delay_ms) OVERRIDE; - void KillTimer() OVERRIDE; - bool IsTimerPending() OVERRIDE; + void SetTimer(int64 delay_ms) override; + void KillTimer() override; + bool IsTimerPending() override; private: // Used to flag that the Run() invocation should return ASAP. diff --git a/tests/shared/browser/main_message_loop_external_pump_mac.mm b/tests/shared/browser/main_message_loop_external_pump_mac.mm index f88361b18..f27f63ee0 100644 --- a/tests/shared/browser/main_message_loop_external_pump_mac.mm +++ b/tests/shared/browser/main_message_loop_external_pump_mac.mm @@ -19,11 +19,11 @@ class MainMessageLoopExternalPumpMac : public MainMessageLoopExternalPump { ~MainMessageLoopExternalPumpMac(); // MainMessageLoopStd methods: - void Quit() OVERRIDE; - int Run() OVERRIDE; + void Quit() override; + int Run() override; // MainMessageLoopExternalPump methods: - void OnScheduleMessagePumpWork(int64 delay_ms) OVERRIDE; + void OnScheduleMessagePumpWork(int64 delay_ms) override; // Internal methods used for processing the event callbacks. They are public // for simplicity but should not be used directly. @@ -32,9 +32,9 @@ class MainMessageLoopExternalPumpMac : public MainMessageLoopExternalPump { protected: // MainMessageLoopExternalPump methods: - void SetTimer(int64 delay_ms) OVERRIDE; - void KillTimer() OVERRIDE; - bool IsTimerPending() OVERRIDE { return timer_ != nil; } + void SetTimer(int64 delay_ms) override; + void KillTimer() override; + bool IsTimerPending() override { return timer_ != nil; } private: // Owner thread that will run events. diff --git a/tests/shared/browser/main_message_loop_external_pump_win.cc b/tests/shared/browser/main_message_loop_external_pump_win.cc index 496bcdd83..a9262120c 100644 --- a/tests/shared/browser/main_message_loop_external_pump_win.cc +++ b/tests/shared/browser/main_message_loop_external_pump_win.cc @@ -23,17 +23,17 @@ class MainMessageLoopExternalPumpWin : public MainMessageLoopExternalPump { ~MainMessageLoopExternalPumpWin(); // MainMessageLoopStd methods: - void Quit() OVERRIDE; - int Run() OVERRIDE; + void Quit() override; + int Run() override; // MainMessageLoopExternalPump methods: - void OnScheduleMessagePumpWork(int64 delay_ms) OVERRIDE; + void OnScheduleMessagePumpWork(int64 delay_ms) override; protected: // MainMessageLoopExternalPump methods: - void SetTimer(int64 delay_ms) OVERRIDE; - void KillTimer() OVERRIDE; - bool IsTimerPending() OVERRIDE { return timer_pending_; } + void SetTimer(int64 delay_ms) override; + void KillTimer() override; + bool IsTimerPending() override { return timer_pending_; } private: static LRESULT CALLBACK WndProc(HWND hwnd, diff --git a/tests/shared/browser/main_message_loop_std.h b/tests/shared/browser/main_message_loop_std.h index 22b34a553..3bded74c4 100644 --- a/tests/shared/browser/main_message_loop_std.h +++ b/tests/shared/browser/main_message_loop_std.h @@ -17,13 +17,13 @@ class MainMessageLoopStd : public MainMessageLoop { MainMessageLoopStd(); // MainMessageLoop methods. - int Run() OVERRIDE; - void Quit() OVERRIDE; - void PostTask(CefRefPtr task) OVERRIDE; - bool RunsTasksOnCurrentThread() const OVERRIDE; + int Run() override; + void Quit() override; + void PostTask(CefRefPtr task) override; + bool RunsTasksOnCurrentThread() const override; #if defined(OS_WIN) - void SetCurrentModelessDialog(HWND hWndDialog) OVERRIDE; + void SetCurrentModelessDialog(HWND hWndDialog) override; #endif private: diff --git a/tests/shared/browser/resource_util_win.cc b/tests/shared/browser/resource_util_win.cc index 055288cab..003f3e72c 100644 --- a/tests/shared/browser/resource_util_win.cc +++ b/tests/shared/browser/resource_util_win.cc @@ -43,7 +43,7 @@ class BinaryResourceProvider : public CefResourceManager::Provider { } } - bool OnRequest(scoped_refptr request) OVERRIDE { + bool OnRequest(scoped_refptr request) override { CEF_REQUIRE_IO_THREAD(); const std::string& url = request->url(); diff --git a/tests/shared/common/client_app.h b/tests/shared/common/client_app.h index 4be9c63a0..553f0d4c2 100644 --- a/tests/shared/common/client_app.h +++ b/tests/shared/common/client_app.h @@ -34,7 +34,7 @@ class ClientApp : public CefApp { // CefApp methods. void OnRegisterCustomSchemes( - CefRawPtr registrar) OVERRIDE; + CefRawPtr registrar) override; DISALLOW_COPY_AND_ASSIGN(ClientApp); }; diff --git a/tests/shared/renderer/client_app_renderer.h b/tests/shared/renderer/client_app_renderer.h index b04108399..e458e354a 100644 --- a/tests/shared/renderer/client_app_renderer.h +++ b/tests/shared/renderer/client_app_renderer.h @@ -80,34 +80,34 @@ class ClientAppRenderer : public ClientApp, public CefRenderProcessHandler { static void CreateDelegates(DelegateSet& delegates); // CefApp methods. - CefRefPtr GetRenderProcessHandler() OVERRIDE { + CefRefPtr GetRenderProcessHandler() override { return this; } // CefRenderProcessHandler methods. - void OnWebKitInitialized() OVERRIDE; + void OnWebKitInitialized() override; void OnBrowserCreated(CefRefPtr browser, - CefRefPtr extra_info) OVERRIDE; - void OnBrowserDestroyed(CefRefPtr browser) OVERRIDE; - CefRefPtr GetLoadHandler() OVERRIDE; + CefRefPtr extra_info) override; + void OnBrowserDestroyed(CefRefPtr browser) override; + CefRefPtr GetLoadHandler() override; void OnContextCreated(CefRefPtr browser, CefRefPtr frame, - CefRefPtr context) OVERRIDE; + CefRefPtr context) override; void OnContextReleased(CefRefPtr browser, CefRefPtr frame, - CefRefPtr context) OVERRIDE; + CefRefPtr context) override; void OnUncaughtException(CefRefPtr browser, CefRefPtr frame, CefRefPtr context, CefRefPtr exception, - CefRefPtr stackTrace) OVERRIDE; + CefRefPtr stackTrace) override; void OnFocusedNodeChanged(CefRefPtr browser, CefRefPtr frame, - CefRefPtr node) OVERRIDE; + CefRefPtr node) override; bool OnProcessMessageReceived(CefRefPtr browser, CefRefPtr frame, CefProcessId source_process, - CefRefPtr message) OVERRIDE; + CefRefPtr message) override; private: // Set of supported Delegates. diff --git a/tools/make_ctocpp_header.py b/tools/make_ctocpp_header.py index 2218198a4..708d7d61c 100644 --- a/tools/make_ctocpp_header.py +++ b/tools/make_ctocpp_header.py @@ -15,7 +15,7 @@ def make_function_body_block(cls): if cls.is_client_side(): impl += ' override;\n' else: - impl += ' OVERRIDE;\n' + impl += ' override;\n' return impl