Update to Chromium revision 40af916d (#303546).

- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-11-12 19:25:15 +00:00
parent 470518a52e
commit eef89ccdd3
329 changed files with 3160 additions and 3731 deletions

View File

@@ -34,7 +34,6 @@ class CefAllowCertificateErrorCallbackCToCpp
: CefCToCpp<CefAllowCertificateErrorCallbackCToCpp,
CefAllowCertificateErrorCallback,
cef_allow_certificate_error_callback_t>(str) {}
virtual ~CefAllowCertificateErrorCallbackCToCpp() {}
// CefAllowCertificateErrorCallback methods
virtual void Continue(bool allow) OVERRIDE;

View File

@@ -29,18 +29,15 @@ class CefAppCToCpp
public:
explicit CefAppCToCpp(cef_app_t* str)
: CefCToCpp<CefAppCToCpp, CefApp, cef_app_t>(str) {}
virtual ~CefAppCToCpp() {}
// CefApp methods
virtual void OnBeforeCommandLineProcessing(const CefString& process_type,
CefRefPtr<CefCommandLine> command_line) OVERRIDE;
virtual void OnRegisterCustomSchemes(
CefRefPtr<CefSchemeRegistrar> registrar) OVERRIDE;
virtual CefRefPtr<CefResourceBundleHandler> GetResourceBundleHandler(
) OVERRIDE;
virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler(
) OVERRIDE;
virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() OVERRIDE;
void OnBeforeCommandLineProcessing(const CefString& process_type,
CefRefPtr<CefCommandLine> command_line) override;
void OnRegisterCustomSchemes(
CefRefPtr<CefSchemeRegistrar> registrar) override;
CefRefPtr<CefResourceBundleHandler> GetResourceBundleHandler() override;
CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() override;
CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,7 +31,6 @@ class CefAuthCallbackCToCpp
explicit CefAuthCallbackCToCpp(cef_auth_callback_t* str)
: CefCToCpp<CefAuthCallbackCToCpp, CefAuthCallback, cef_auth_callback_t>(
str) {}
virtual ~CefAuthCallbackCToCpp() {}
// CefAuthCallback methods
virtual void Continue(const CefString& username,

View File

@@ -31,7 +31,6 @@ class CefBeforeDownloadCallbackCToCpp
explicit CefBeforeDownloadCallbackCToCpp(cef_before_download_callback_t* str)
: CefCToCpp<CefBeforeDownloadCallbackCToCpp, CefBeforeDownloadCallback,
cef_before_download_callback_t>(str) {}
virtual ~CefBeforeDownloadCallbackCToCpp() {}
// CefBeforeDownloadCallback methods
virtual void Continue(const CefString& download_path,

View File

@@ -31,7 +31,6 @@ class CefBinaryValueCToCpp
explicit CefBinaryValueCToCpp(cef_binary_value_t* str)
: CefCToCpp<CefBinaryValueCToCpp, CefBinaryValue, cef_binary_value_t>(
str) {}
virtual ~CefBinaryValueCToCpp() {}
// CefBinaryValue methods
virtual bool IsValid() OVERRIDE;

View File

@@ -32,7 +32,6 @@ class CefBrowserCToCpp
public:
explicit CefBrowserCToCpp(cef_browser_t* str)
: CefCToCpp<CefBrowserCToCpp, CefBrowser, cef_browser_t>(str) {}
virtual ~CefBrowserCToCpp() {}
// CefBrowser methods
virtual CefRefPtr<CefBrowserHost> GetHost() OVERRIDE;

View File

@@ -34,7 +34,6 @@ class CefBrowserHostCToCpp
explicit CefBrowserHostCToCpp(cef_browser_host_t* str)
: CefCToCpp<CefBrowserHostCToCpp, CefBrowserHost, cef_browser_host_t>(
str) {}
virtual ~CefBrowserHostCToCpp() {}
// CefBrowserHost methods
virtual CefRefPtr<CefBrowser> GetBrowser() OVERRIDE;

View File

@@ -31,15 +31,14 @@ class CefBrowserProcessHandlerCToCpp
explicit CefBrowserProcessHandlerCToCpp(cef_browser_process_handler_t* str)
: CefCToCpp<CefBrowserProcessHandlerCToCpp, CefBrowserProcessHandler,
cef_browser_process_handler_t>(str) {}
virtual ~CefBrowserProcessHandlerCToCpp() {}
// CefBrowserProcessHandler methods
virtual void OnContextInitialized() OVERRIDE;
virtual void OnBeforeChildProcessLaunch(
CefRefPtr<CefCommandLine> command_line) OVERRIDE;
virtual void OnRenderProcessThreadCreated(
CefRefPtr<CefListValue> extra_info) OVERRIDE;
virtual CefRefPtr<CefPrintHandler> GetPrintHandler() OVERRIDE;
void OnContextInitialized() override;
void OnBeforeChildProcessLaunch(
CefRefPtr<CefCommandLine> command_line) override;
void OnRenderProcessThreadCreated(
CefRefPtr<CefListValue> extra_info) override;
CefRefPtr<CefPrintHandler> GetPrintHandler() override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,7 +29,6 @@ class CefCallbackCToCpp
public:
explicit CefCallbackCToCpp(cef_callback_t* str)
: CefCToCpp<CefCallbackCToCpp, CefCallback, cef_callback_t>(str) {}
virtual ~CefCallbackCToCpp() {}
// CefCallback methods
virtual void Continue() OVERRIDE;

View File

@@ -29,25 +29,24 @@ class CefClientCToCpp
public:
explicit CefClientCToCpp(cef_client_t* str)
: CefCToCpp<CefClientCToCpp, CefClient, cef_client_t>(str) {}
virtual ~CefClientCToCpp() {}
// CefClient methods
virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() OVERRIDE;
virtual CefRefPtr<CefDialogHandler> GetDialogHandler() OVERRIDE;
virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE;
virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() OVERRIDE;
virtual CefRefPtr<CefDragHandler> GetDragHandler() OVERRIDE;
virtual CefRefPtr<CefFocusHandler> GetFocusHandler() OVERRIDE;
virtual CefRefPtr<CefGeolocationHandler> GetGeolocationHandler() OVERRIDE;
virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() OVERRIDE;
virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() OVERRIDE;
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE;
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE;
virtual CefRefPtr<CefRenderHandler> GetRenderHandler() OVERRIDE;
virtual CefRefPtr<CefRequestHandler> GetRequestHandler() OVERRIDE;
virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() override;
CefRefPtr<CefDialogHandler> GetDialogHandler() override;
CefRefPtr<CefDisplayHandler> GetDisplayHandler() override;
CefRefPtr<CefDownloadHandler> GetDownloadHandler() override;
CefRefPtr<CefDragHandler> GetDragHandler() override;
CefRefPtr<CefFocusHandler> GetFocusHandler() override;
CefRefPtr<CefGeolocationHandler> GetGeolocationHandler() override;
CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() override;
CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() override;
CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override;
CefRefPtr<CefLoadHandler> GetLoadHandler() override;
CefRefPtr<CefRenderHandler> GetRenderHandler() override;
CefRefPtr<CefRequestHandler> GetRequestHandler() override;
bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
CefProcessId source_process,
CefRefPtr<CefProcessMessage> message) OVERRIDE;
CefRefPtr<CefProcessMessage> message) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -32,7 +32,6 @@ class CefCommandLineCToCpp
explicit CefCommandLineCToCpp(cef_command_line_t* str)
: CefCToCpp<CefCommandLineCToCpp, CefCommandLine, cef_command_line_t>(
str) {}
virtual ~CefCommandLineCToCpp() {}
// CefCommandLine methods
virtual bool IsValid() OVERRIDE;

View File

@@ -31,10 +31,9 @@ class CefCompletionCallbackCToCpp
explicit CefCompletionCallbackCToCpp(cef_completion_callback_t* str)
: CefCToCpp<CefCompletionCallbackCToCpp, CefCompletionCallback,
cef_completion_callback_t>(str) {}
virtual ~CefCompletionCallbackCToCpp() {}
// CefCompletionCallback methods
virtual void OnComplete() OVERRIDE;
void OnComplete() override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,17 +31,16 @@ class CefContextMenuHandlerCToCpp
explicit CefContextMenuHandlerCToCpp(cef_context_menu_handler_t* str)
: CefCToCpp<CefContextMenuHandlerCToCpp, CefContextMenuHandler,
cef_context_menu_handler_t>(str) {}
virtual ~CefContextMenuHandlerCToCpp() {}
// CefContextMenuHandler methods
virtual void OnBeforeContextMenu(CefRefPtr<CefBrowser> browser,
void OnBeforeContextMenu(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefContextMenuParams> params,
CefRefPtr<CefMenuModel> model) OVERRIDE;
virtual bool OnContextMenuCommand(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefMenuModel> model) override;
bool OnContextMenuCommand(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefContextMenuParams> params,
int command_id, EventFlags event_flags) OVERRIDE;
virtual void OnContextMenuDismissed(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame) OVERRIDE;
int command_id, EventFlags event_flags) override;
void OnContextMenuDismissed(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -32,7 +32,6 @@ class CefContextMenuParamsCToCpp
explicit CefContextMenuParamsCToCpp(cef_context_menu_params_t* str)
: CefCToCpp<CefContextMenuParamsCToCpp, CefContextMenuParams,
cef_context_menu_params_t>(str) {}
virtual ~CefContextMenuParamsCToCpp() {}
// CefContextMenuParams methods
virtual int GetXCoord() OVERRIDE;

View File

@@ -32,7 +32,6 @@ class CefCookieManagerCToCpp
explicit CefCookieManagerCToCpp(cef_cookie_manager_t* str)
: CefCToCpp<CefCookieManagerCToCpp, CefCookieManager,
cef_cookie_manager_t>(str) {}
virtual ~CefCookieManagerCToCpp() {}
// CefCookieManager methods
virtual void SetSupportedSchemes(

View File

@@ -31,11 +31,10 @@ class CefCookieVisitorCToCpp
explicit CefCookieVisitorCToCpp(cef_cookie_visitor_t* str)
: CefCToCpp<CefCookieVisitorCToCpp, CefCookieVisitor,
cef_cookie_visitor_t>(str) {}
virtual ~CefCookieVisitorCToCpp() {}
// CefCookieVisitor methods
virtual bool Visit(const CefCookie& cookie, int count, int total,
bool& deleteCookie) OVERRIDE;
bool Visit(const CefCookie& cookie, int count, int total,
bool& deleteCookie) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -32,13 +32,12 @@ class CefDialogHandlerCToCpp
explicit CefDialogHandlerCToCpp(cef_dialog_handler_t* str)
: CefCToCpp<CefDialogHandlerCToCpp, CefDialogHandler,
cef_dialog_handler_t>(str) {}
virtual ~CefDialogHandlerCToCpp() {}
// CefDialogHandler methods
virtual bool OnFileDialog(CefRefPtr<CefBrowser> browser, FileDialogMode mode,
bool OnFileDialog(CefRefPtr<CefBrowser> browser, FileDialogMode mode,
const CefString& title, const CefString& default_file_name,
const std::vector<CefString>& accept_types,
CefRefPtr<CefFileDialogCallback> callback) OVERRIDE;
CefRefPtr<CefFileDialogCallback> callback) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,7 +31,6 @@ class CefDictionaryValueCToCpp
explicit CefDictionaryValueCToCpp(cef_dictionary_value_t* str)
: CefCToCpp<CefDictionaryValueCToCpp, CefDictionaryValue,
cef_dictionary_value_t>(str) {}
virtual ~CefDictionaryValueCToCpp() {}
// CefDictionaryValue methods
virtual bool IsValid() OVERRIDE;

View File

@@ -31,19 +31,17 @@ class CefDisplayHandlerCToCpp
explicit CefDisplayHandlerCToCpp(cef_display_handler_t* str)
: CefCToCpp<CefDisplayHandlerCToCpp, CefDisplayHandler,
cef_display_handler_t>(str) {}
virtual ~CefDisplayHandlerCToCpp() {}
// CefDisplayHandler methods
virtual void OnAddressChange(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, const CefString& url) OVERRIDE;
virtual void OnTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title) OVERRIDE;
virtual bool OnTooltip(CefRefPtr<CefBrowser> browser,
CefString& text) OVERRIDE;
virtual void OnStatusMessage(CefRefPtr<CefBrowser> browser,
const CefString& value) OVERRIDE;
virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
const CefString& message, const CefString& source, int line) OVERRIDE;
void OnAddressChange(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
const CefString& url) override;
void OnTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title) override;
bool OnTooltip(CefRefPtr<CefBrowser> browser, CefString& text) override;
void OnStatusMessage(CefRefPtr<CefBrowser> browser,
const CefString& value) override;
bool OnConsoleMessage(CefRefPtr<CefBrowser> browser, const CefString& message,
const CefString& source, int line) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,7 +31,6 @@ class CefDOMDocumentCToCpp
explicit CefDOMDocumentCToCpp(cef_domdocument_t* str)
: CefCToCpp<CefDOMDocumentCToCpp, CefDOMDocument, cef_domdocument_t>(
str) {}
virtual ~CefDOMDocumentCToCpp() {}
// CefDOMDocument methods
virtual Type GetType() OVERRIDE;

View File

@@ -29,7 +29,6 @@ class CefDOMNodeCToCpp
public:
explicit CefDOMNodeCToCpp(cef_domnode_t* str)
: CefCToCpp<CefDOMNodeCToCpp, CefDOMNode, cef_domnode_t>(str) {}
virtual ~CefDOMNodeCToCpp() {}
// CefDOMNode methods
virtual Type GetType() OVERRIDE;

View File

@@ -29,10 +29,9 @@ class CefDOMVisitorCToCpp
public:
explicit CefDOMVisitorCToCpp(cef_domvisitor_t* str)
: CefCToCpp<CefDOMVisitorCToCpp, CefDOMVisitor, cef_domvisitor_t>(str) {}
virtual ~CefDOMVisitorCToCpp() {}
// CefDOMVisitor methods
virtual void Visit(CefRefPtr<CefDOMDocument> document) OVERRIDE;
void Visit(CefRefPtr<CefDOMDocument> document) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,16 +31,15 @@ class CefDownloadHandlerCToCpp
explicit CefDownloadHandlerCToCpp(cef_download_handler_t* str)
: CefCToCpp<CefDownloadHandlerCToCpp, CefDownloadHandler,
cef_download_handler_t>(str) {}
virtual ~CefDownloadHandlerCToCpp() {}
// CefDownloadHandler methods
virtual void OnBeforeDownload(CefRefPtr<CefBrowser> browser,
void OnBeforeDownload(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDownloadItem> download_item,
const CefString& suggested_name,
CefRefPtr<CefBeforeDownloadCallback> callback) OVERRIDE;
virtual void OnDownloadUpdated(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefBeforeDownloadCallback> callback) override;
void OnDownloadUpdated(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDownloadItem> download_item,
CefRefPtr<CefDownloadItemCallback> callback) OVERRIDE;
CefRefPtr<CefDownloadItemCallback> callback) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,7 +31,6 @@ class CefDownloadItemCallbackCToCpp
explicit CefDownloadItemCallbackCToCpp(cef_download_item_callback_t* str)
: CefCToCpp<CefDownloadItemCallbackCToCpp, CefDownloadItemCallback,
cef_download_item_callback_t>(str) {}
virtual ~CefDownloadItemCallbackCToCpp() {}
// CefDownloadItemCallback methods
virtual void Cancel() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefDownloadItemCToCpp
explicit CefDownloadItemCToCpp(cef_download_item_t* str)
: CefCToCpp<CefDownloadItemCToCpp, CefDownloadItem, cef_download_item_t>(
str) {}
virtual ~CefDownloadItemCToCpp() {}
// CefDownloadItem methods
virtual bool IsValid() OVERRIDE;

View File

@@ -30,7 +30,6 @@ class CefDragDataCToCpp
public:
explicit CefDragDataCToCpp(cef_drag_data_t* str)
: CefCToCpp<CefDragDataCToCpp, CefDragData, cef_drag_data_t>(str) {}
virtual ~CefDragDataCToCpp() {}
// CefDragData methods
virtual CefRefPtr<CefDragData> Clone() OVERRIDE;

View File

@@ -31,11 +31,10 @@ class CefDragHandlerCToCpp
explicit CefDragHandlerCToCpp(cef_drag_handler_t* str)
: CefCToCpp<CefDragHandlerCToCpp, CefDragHandler, cef_drag_handler_t>(
str) {}
virtual ~CefDragHandlerCToCpp() {}
// CefDragHandler methods
virtual bool OnDragEnter(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDragData> dragData, DragOperationsMask mask) OVERRIDE;
bool OnDragEnter(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDragData> dragData, DragOperationsMask mask) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,10 +31,9 @@ class CefEndTracingCallbackCToCpp
explicit CefEndTracingCallbackCToCpp(cef_end_tracing_callback_t* str)
: CefCToCpp<CefEndTracingCallbackCToCpp, CefEndTracingCallback,
cef_end_tracing_callback_t>(str) {}
virtual ~CefEndTracingCallbackCToCpp() {}
// CefEndTracingCallback methods
virtual void OnEndTracingComplete(const CefString& tracing_file) OVERRIDE;
void OnEndTracingComplete(const CefString& tracing_file) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -32,7 +32,6 @@ class CefFileDialogCallbackCToCpp
explicit CefFileDialogCallbackCToCpp(cef_file_dialog_callback_t* str)
: CefCToCpp<CefFileDialogCallbackCToCpp, CefFileDialogCallback,
cef_file_dialog_callback_t>(str) {}
virtual ~CefFileDialogCallbackCToCpp() {}
// CefFileDialogCallback methods
virtual void Continue(const std::vector<CefString>& file_paths) OVERRIDE;

View File

@@ -31,13 +31,11 @@ class CefFocusHandlerCToCpp
explicit CefFocusHandlerCToCpp(cef_focus_handler_t* str)
: CefCToCpp<CefFocusHandlerCToCpp, CefFocusHandler, cef_focus_handler_t>(
str) {}
virtual ~CefFocusHandlerCToCpp() {}
// CefFocusHandler methods
virtual void OnTakeFocus(CefRefPtr<CefBrowser> browser, bool next) OVERRIDE;
virtual bool OnSetFocus(CefRefPtr<CefBrowser> browser,
FocusSource source) OVERRIDE;
virtual void OnGotFocus(CefRefPtr<CefBrowser> browser) OVERRIDE;
void OnTakeFocus(CefRefPtr<CefBrowser> browser, bool next) override;
bool OnSetFocus(CefRefPtr<CefBrowser> browser, FocusSource source) override;
void OnGotFocus(CefRefPtr<CefBrowser> browser) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -33,7 +33,6 @@ class CefFrameCToCpp
public:
explicit CefFrameCToCpp(cef_frame_t* str)
: CefCToCpp<CefFrameCToCpp, CefFrame, cef_frame_t>(str) {}
virtual ~CefFrameCToCpp() {}
// CefFrame methods
virtual bool IsValid() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefGeolocationCallbackCToCpp
explicit CefGeolocationCallbackCToCpp(cef_geolocation_callback_t* str)
: CefCToCpp<CefGeolocationCallbackCToCpp, CefGeolocationCallback,
cef_geolocation_callback_t>(str) {}
virtual ~CefGeolocationCallbackCToCpp() {}
// CefGeolocationCallback methods
virtual void Continue(bool allow) OVERRIDE;

View File

@@ -31,14 +31,13 @@ class CefGeolocationHandlerCToCpp
explicit CefGeolocationHandlerCToCpp(cef_geolocation_handler_t* str)
: CefCToCpp<CefGeolocationHandlerCToCpp, CefGeolocationHandler,
cef_geolocation_handler_t>(str) {}
virtual ~CefGeolocationHandlerCToCpp() {}
// CefGeolocationHandler methods
virtual bool OnRequestGeolocationPermission(CefRefPtr<CefBrowser> browser,
bool OnRequestGeolocationPermission(CefRefPtr<CefBrowser> browser,
const CefString& requesting_url, int request_id,
CefRefPtr<CefGeolocationCallback> callback) OVERRIDE;
virtual void OnCancelGeolocationPermission(CefRefPtr<CefBrowser> browser,
const CefString& requesting_url, int request_id) OVERRIDE;
CefRefPtr<CefGeolocationCallback> callback) override;
void OnCancelGeolocationPermission(CefRefPtr<CefBrowser> browser,
const CefString& requesting_url, int request_id) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,10 +31,9 @@ class CefGetGeolocationCallbackCToCpp
explicit CefGetGeolocationCallbackCToCpp(cef_get_geolocation_callback_t* str)
: CefCToCpp<CefGetGeolocationCallbackCToCpp, CefGetGeolocationCallback,
cef_get_geolocation_callback_t>(str) {}
virtual ~CefGetGeolocationCallbackCToCpp() {}
// CefGetGeolocationCallback methods
virtual void OnLocationUpdate(const CefGeoposition& position) OVERRIDE;
void OnLocationUpdate(const CefGeoposition& position) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,7 +31,6 @@ class CefJSDialogCallbackCToCpp
explicit CefJSDialogCallbackCToCpp(cef_jsdialog_callback_t* str)
: CefCToCpp<CefJSDialogCallbackCToCpp, CefJSDialogCallback,
cef_jsdialog_callback_t>(str) {}
virtual ~CefJSDialogCallbackCToCpp() {}
// CefJSDialogCallback methods
virtual void Continue(bool success, const CefString& user_input) OVERRIDE;

View File

@@ -31,20 +31,18 @@ class CefJSDialogHandlerCToCpp
explicit CefJSDialogHandlerCToCpp(cef_jsdialog_handler_t* str)
: CefCToCpp<CefJSDialogHandlerCToCpp, CefJSDialogHandler,
cef_jsdialog_handler_t>(str) {}
virtual ~CefJSDialogHandlerCToCpp() {}
// CefJSDialogHandler methods
virtual bool OnJSDialog(CefRefPtr<CefBrowser> browser,
const CefString& origin_url, const CefString& accept_lang,
JSDialogType dialog_type, const CefString& message_text,
const CefString& default_prompt_text,
bool OnJSDialog(CefRefPtr<CefBrowser> browser, const CefString& origin_url,
const CefString& accept_lang, JSDialogType dialog_type,
const CefString& message_text, const CefString& default_prompt_text,
CefRefPtr<CefJSDialogCallback> callback,
bool& suppress_message) OVERRIDE;
virtual bool OnBeforeUnloadDialog(CefRefPtr<CefBrowser> browser,
bool& suppress_message) override;
bool OnBeforeUnloadDialog(CefRefPtr<CefBrowser> browser,
const CefString& message_text, bool is_reload,
CefRefPtr<CefJSDialogCallback> callback) OVERRIDE;
virtual void OnResetDialogState(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnDialogClosed(CefRefPtr<CefBrowser> browser) OVERRIDE;
CefRefPtr<CefJSDialogCallback> callback) override;
void OnResetDialogState(CefRefPtr<CefBrowser> browser) override;
void OnDialogClosed(CefRefPtr<CefBrowser> browser) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,14 +31,12 @@ class CefKeyboardHandlerCToCpp
explicit CefKeyboardHandlerCToCpp(cef_keyboard_handler_t* str)
: CefCToCpp<CefKeyboardHandlerCToCpp, CefKeyboardHandler,
cef_keyboard_handler_t>(str) {}
virtual ~CefKeyboardHandlerCToCpp() {}
// CefKeyboardHandler methods
virtual bool OnPreKeyEvent(CefRefPtr<CefBrowser> browser,
const CefKeyEvent& event, CefEventHandle os_event,
bool* is_keyboard_shortcut) OVERRIDE;
virtual bool OnKeyEvent(CefRefPtr<CefBrowser> browser,
const CefKeyEvent& event, CefEventHandle os_event) OVERRIDE;
bool OnPreKeyEvent(CefRefPtr<CefBrowser> browser, const CefKeyEvent& event,
CefEventHandle os_event, bool* is_keyboard_shortcut) override;
bool OnKeyEvent(CefRefPtr<CefBrowser> browser, const CefKeyEvent& event,
CefEventHandle os_event) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -33,19 +33,17 @@ class CefLifeSpanHandlerCToCpp
explicit CefLifeSpanHandlerCToCpp(cef_life_span_handler_t* str)
: CefCToCpp<CefLifeSpanHandlerCToCpp, CefLifeSpanHandler,
cef_life_span_handler_t>(str) {}
virtual ~CefLifeSpanHandlerCToCpp() {}
// CefLifeSpanHandler methods
virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, const CefString& target_url,
const CefString& target_frame_name,
bool OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
const CefString& target_url, const CefString& target_frame_name,
const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo,
CefRefPtr<CefClient>& client, CefBrowserSettings& settings,
bool* no_javascript_access) OVERRIDE;
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual bool RunModal(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
bool* no_javascript_access) override;
void OnAfterCreated(CefRefPtr<CefBrowser> browser) override;
bool RunModal(CefRefPtr<CefBrowser> browser) override;
bool DoClose(CefRefPtr<CefBrowser> browser) override;
void OnBeforeClose(CefRefPtr<CefBrowser> browser) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,7 +29,6 @@ class CefListValueCToCpp
public:
explicit CefListValueCToCpp(cef_list_value_t* str)
: CefCToCpp<CefListValueCToCpp, CefListValue, cef_list_value_t>(str) {}
virtual ~CefListValueCToCpp() {}
// CefListValue methods
virtual bool IsValid() OVERRIDE;

View File

@@ -31,18 +31,17 @@ class CefLoadHandlerCToCpp
explicit CefLoadHandlerCToCpp(cef_load_handler_t* str)
: CefCToCpp<CefLoadHandlerCToCpp, CefLoadHandler, cef_load_handler_t>(
str) {}
virtual ~CefLoadHandlerCToCpp() {}
// CefLoadHandler methods
virtual void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
bool isLoading, bool canGoBack, bool canGoForward) OVERRIDE;
virtual void OnLoadStart(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame) OVERRIDE;
virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, int httpStatusCode) OVERRIDE;
virtual void OnLoadError(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, ErrorCode errorCode,
const CefString& errorText, const CefString& failedUrl) OVERRIDE;
void OnLoadingStateChange(CefRefPtr<CefBrowser> browser, bool isLoading,
bool canGoBack, bool canGoForward) override;
void OnLoadStart(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame) override;
void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
int httpStatusCode) override;
void OnLoadError(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
ErrorCode errorCode, const CefString& errorText,
const CefString& failedUrl) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,7 +29,6 @@ class CefMenuModelCToCpp
public:
explicit CefMenuModelCToCpp(cef_menu_model_t* str)
: CefCToCpp<CefMenuModelCToCpp, CefMenuModel, cef_menu_model_t>(str) {}
virtual ~CefMenuModelCToCpp() {}
// CefMenuModel methods
virtual bool Clear() OVERRIDE;

View File

@@ -29,7 +29,6 @@ class CefPostDataCToCpp
public:
explicit CefPostDataCToCpp(cef_post_data_t* str)
: CefCToCpp<CefPostDataCToCpp, CefPostData, cef_post_data_t>(str) {}
virtual ~CefPostDataCToCpp() {}
// CefPostData methods
virtual bool IsReadOnly() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefPostDataElementCToCpp
explicit CefPostDataElementCToCpp(cef_post_data_element_t* str)
: CefCToCpp<CefPostDataElementCToCpp, CefPostDataElement,
cef_post_data_element_t>(str) {}
virtual ~CefPostDataElementCToCpp() {}
// CefPostDataElement methods
virtual bool IsReadOnly() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefPrintDialogCallbackCToCpp
explicit CefPrintDialogCallbackCToCpp(cef_print_dialog_callback_t* str)
: CefCToCpp<CefPrintDialogCallbackCToCpp, CefPrintDialogCallback,
cef_print_dialog_callback_t>(str) {}
virtual ~CefPrintDialogCallbackCToCpp() {}
// CefPrintDialogCallback methods
virtual void Continue(CefRefPtr<CefPrintSettings> settings) OVERRIDE;

View File

@@ -31,17 +31,16 @@ class CefPrintHandlerCToCpp
explicit CefPrintHandlerCToCpp(cef_print_handler_t* str)
: CefCToCpp<CefPrintHandlerCToCpp, CefPrintHandler, cef_print_handler_t>(
str) {}
virtual ~CefPrintHandlerCToCpp() {}
// CefPrintHandler methods
virtual void OnPrintSettings(CefRefPtr<CefPrintSettings> settings,
bool get_defaults) OVERRIDE;
virtual bool OnPrintDialog(bool has_selection,
CefRefPtr<CefPrintDialogCallback> callback) OVERRIDE;
virtual bool OnPrintJob(const CefString& document_name,
void OnPrintSettings(CefRefPtr<CefPrintSettings> settings,
bool get_defaults) override;
bool OnPrintDialog(bool has_selection,
CefRefPtr<CefPrintDialogCallback> callback) override;
bool OnPrintJob(const CefString& document_name,
const CefString& pdf_file_path,
CefRefPtr<CefPrintJobCallback> callback) OVERRIDE;
virtual void OnPrintReset() OVERRIDE;
CefRefPtr<CefPrintJobCallback> callback) override;
void OnPrintReset() override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,7 +31,6 @@ class CefPrintJobCallbackCToCpp
explicit CefPrintJobCallbackCToCpp(cef_print_job_callback_t* str)
: CefCToCpp<CefPrintJobCallbackCToCpp, CefPrintJobCallback,
cef_print_job_callback_t>(str) {}
virtual ~CefPrintJobCallbackCToCpp() {}
// CefPrintJobCallback methods
virtual void Continue() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefPrintSettingsCToCpp
explicit CefPrintSettingsCToCpp(cef_print_settings_t* str)
: CefCToCpp<CefPrintSettingsCToCpp, CefPrintSettings,
cef_print_settings_t>(str) {}
virtual ~CefPrintSettingsCToCpp() {}
// CefPrintSettings methods
virtual bool IsValid() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefProcessMessageCToCpp
explicit CefProcessMessageCToCpp(cef_process_message_t* str)
: CefCToCpp<CefProcessMessageCToCpp, CefProcessMessage,
cef_process_message_t>(str) {}
virtual ~CefProcessMessageCToCpp() {}
// CefProcessMessage methods
virtual bool IsValid() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefQuotaCallbackCToCpp
explicit CefQuotaCallbackCToCpp(cef_quota_callback_t* str)
: CefCToCpp<CefQuotaCallbackCToCpp, CefQuotaCallback,
cef_quota_callback_t>(str) {}
virtual ~CefQuotaCallbackCToCpp() {}
// CefQuotaCallback methods
virtual void Continue(bool allow) OVERRIDE;

View File

@@ -31,14 +31,13 @@ class CefReadHandlerCToCpp
explicit CefReadHandlerCToCpp(cef_read_handler_t* str)
: CefCToCpp<CefReadHandlerCToCpp, CefReadHandler, cef_read_handler_t>(
str) {}
virtual ~CefReadHandlerCToCpp() {}
// CefReadHandler methods
virtual size_t Read(void* ptr, size_t size, size_t n) OVERRIDE;
virtual int Seek(int64 offset, int whence) OVERRIDE;
virtual int64 Tell() OVERRIDE;
virtual int Eof() OVERRIDE;
virtual bool MayBlock() OVERRIDE;
size_t Read(void* ptr, size_t size, size_t n) override;
int Seek(int64 offset, int whence) override;
int64 Tell() override;
int Eof() override;
bool MayBlock() override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,31 +31,27 @@ class CefRenderHandlerCToCpp
explicit CefRenderHandlerCToCpp(cef_render_handler_t* str)
: CefCToCpp<CefRenderHandlerCToCpp, CefRenderHandler,
cef_render_handler_t>(str) {}
virtual ~CefRenderHandlerCToCpp() {}
// CefRenderHandler methods
virtual bool GetRootScreenRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) OVERRIDE;
virtual bool GetViewRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) OVERRIDE;
virtual bool GetScreenPoint(CefRefPtr<CefBrowser> browser, int viewX,
int viewY, int& screenX, int& screenY) OVERRIDE;
virtual bool GetScreenInfo(CefRefPtr<CefBrowser> browser,
CefScreenInfo& screen_info) OVERRIDE;
virtual void OnPopupShow(CefRefPtr<CefBrowser> browser, bool show) OVERRIDE;
virtual void OnPopupSize(CefRefPtr<CefBrowser> browser,
const CefRect& rect) OVERRIDE;
virtual void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
bool GetRootScreenRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override;
bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override;
bool GetScreenPoint(CefRefPtr<CefBrowser> browser, int viewX, int viewY,
int& screenX, int& screenY) override;
bool GetScreenInfo(CefRefPtr<CefBrowser> browser,
CefScreenInfo& screen_info) override;
void OnPopupShow(CefRefPtr<CefBrowser> browser, bool show) override;
void OnPopupSize(CefRefPtr<CefBrowser> browser, const CefRect& rect) override;
void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
const RectList& dirtyRects, const void* buffer, int width,
int height) OVERRIDE;
virtual void OnCursorChange(CefRefPtr<CefBrowser> browser,
CefCursorHandle cursor) OVERRIDE;
virtual bool StartDragging(CefRefPtr<CefBrowser> browser,
int height) override;
void OnCursorChange(CefRefPtr<CefBrowser> browser,
CefCursorHandle cursor) override;
bool StartDragging(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDragData> drag_data, DragOperationsMask allowed_ops, int x,
int y) OVERRIDE;
virtual void UpdateDragCursor(CefRefPtr<CefBrowser> browser,
DragOperation operation) OVERRIDE;
virtual void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser) OVERRIDE;
int y) override;
void UpdateDragCursor(CefRefPtr<CefBrowser> browser,
DragOperation operation) override;
void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,31 +31,29 @@ class CefRenderProcessHandlerCToCpp
explicit CefRenderProcessHandlerCToCpp(cef_render_process_handler_t* str)
: CefCToCpp<CefRenderProcessHandlerCToCpp, CefRenderProcessHandler,
cef_render_process_handler_t>(str) {}
virtual ~CefRenderProcessHandlerCToCpp() {}
// CefRenderProcessHandler methods
virtual void OnRenderThreadCreated(
CefRefPtr<CefListValue> extra_info) OVERRIDE;
virtual void OnWebKitInitialized() OVERRIDE;
virtual void OnBrowserCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE;
virtual bool OnBeforeNavigation(CefRefPtr<CefBrowser> browser,
void OnRenderThreadCreated(CefRefPtr<CefListValue> extra_info) override;
void OnWebKitInitialized() override;
void OnBrowserCreated(CefRefPtr<CefBrowser> browser) override;
void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) override;
CefRefPtr<CefLoadHandler> GetLoadHandler() override;
bool OnBeforeNavigation(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
NavigationType navigation_type, bool is_redirect) OVERRIDE;
virtual void OnContextCreated(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) OVERRIDE;
virtual void OnContextReleased(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) OVERRIDE;
virtual void OnUncaughtException(CefRefPtr<CefBrowser> browser,
NavigationType navigation_type, bool is_redirect) override;
void OnContextCreated(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override;
void OnContextReleased(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override;
void OnUncaughtException(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context,
CefRefPtr<CefV8Exception> exception,
CefRefPtr<CefV8StackTrace> stackTrace) OVERRIDE;
virtual void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node) OVERRIDE;
virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefV8StackTrace> stackTrace) override;
void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node) override;
bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
CefProcessId source_process,
CefRefPtr<CefProcessMessage> message) OVERRIDE;
CefRefPtr<CefProcessMessage> message) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,7 +31,6 @@ class CefRequestContextCToCpp
explicit CefRequestContextCToCpp(cef_request_context_t* str)
: CefCToCpp<CefRequestContextCToCpp, CefRequestContext,
cef_request_context_t>(str) {}
virtual ~CefRequestContextCToCpp() {}
// CefRequestContext methods
virtual bool IsSame(CefRefPtr<CefRequestContext> other) OVERRIDE;

View File

@@ -31,10 +31,9 @@ class CefRequestContextHandlerCToCpp
explicit CefRequestContextHandlerCToCpp(cef_request_context_handler_t* str)
: CefCToCpp<CefRequestContextHandlerCToCpp, CefRequestContextHandler,
cef_request_context_handler_t>(str) {}
virtual ~CefRequestContextHandlerCToCpp() {}
// CefRequestContextHandler methods
virtual CefRefPtr<CefCookieManager> GetCookieManager() OVERRIDE;
CefRefPtr<CefCookieManager> GetCookieManager() override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,7 +29,6 @@ class CefRequestCToCpp
public:
explicit CefRequestCToCpp(cef_request_t* str)
: CefCToCpp<CefRequestCToCpp, CefRequest, cef_request_t>(str) {}
virtual ~CefRequestCToCpp() {}
// CefRequest methods
virtual bool IsReadOnly() OVERRIDE;

View File

@@ -31,39 +31,36 @@ class CefRequestHandlerCToCpp
explicit CefRequestHandlerCToCpp(cef_request_handler_t* str)
: CefCToCpp<CefRequestHandlerCToCpp, CefRequestHandler,
cef_request_handler_t>(str) {}
virtual ~CefRequestHandlerCToCpp() {}
// CefRequestHandler methods
virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
bool is_redirect) OVERRIDE;
virtual bool OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request) OVERRIDE;
virtual CefRefPtr<CefResourceHandler> GetResourceHandler(
bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
CefRefPtr<CefRequest> request, bool is_redirect) override;
bool OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request) override;
CefRefPtr<CefResourceHandler> GetResourceHandler(
CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
CefRefPtr<CefRequest> request) OVERRIDE;
virtual void OnResourceRedirect(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefRequest> request) override;
void OnResourceRedirect(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, const CefString& old_url,
CefString& new_url) OVERRIDE;
virtual bool GetAuthCredentials(CefRefPtr<CefBrowser> browser,
CefString& new_url) override;
bool GetAuthCredentials(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, bool isProxy, const CefString& host, int port,
const CefString& realm, const CefString& scheme,
CefRefPtr<CefAuthCallback> callback) OVERRIDE;
virtual bool OnQuotaRequest(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefAuthCallback> callback) override;
bool OnQuotaRequest(CefRefPtr<CefBrowser> browser,
const CefString& origin_url, int64 new_size,
CefRefPtr<CefQuotaCallback> callback) OVERRIDE;
virtual void OnProtocolExecution(CefRefPtr<CefBrowser> browser,
const CefString& url, bool& allow_os_execution) OVERRIDE;
virtual bool OnCertificateError(cef_errorcode_t cert_error,
CefRefPtr<CefQuotaCallback> callback) override;
void OnProtocolExecution(CefRefPtr<CefBrowser> browser, const CefString& url,
bool& allow_os_execution) override;
bool OnCertificateError(cef_errorcode_t cert_error,
const CefString& request_url,
CefRefPtr<CefAllowCertificateErrorCallback> callback) OVERRIDE;
virtual bool OnBeforePluginLoad(CefRefPtr<CefBrowser> browser,
const CefString& url, const CefString& policy_url,
CefRefPtr<CefWebPluginInfo> info) OVERRIDE;
virtual void OnPluginCrashed(CefRefPtr<CefBrowser> browser,
const CefString& plugin_path) OVERRIDE;
virtual void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
TerminationStatus status) OVERRIDE;
CefRefPtr<CefAllowCertificateErrorCallback> callback) override;
bool OnBeforePluginLoad(CefRefPtr<CefBrowser> browser, const CefString& url,
const CefString& policy_url, CefRefPtr<CefWebPluginInfo> info) override;
void OnPluginCrashed(CefRefPtr<CefBrowser> browser,
const CefString& plugin_path) override;
void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
TerminationStatus status) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,12 +31,11 @@ class CefResourceBundleHandlerCToCpp
explicit CefResourceBundleHandlerCToCpp(cef_resource_bundle_handler_t* str)
: CefCToCpp<CefResourceBundleHandlerCToCpp, CefResourceBundleHandler,
cef_resource_bundle_handler_t>(str) {}
virtual ~CefResourceBundleHandlerCToCpp() {}
// CefResourceBundleHandler methods
virtual bool GetLocalizedString(int message_id, CefString& string) OVERRIDE;
virtual bool GetDataResource(int resource_id, void*& data,
size_t& data_size) OVERRIDE;
bool GetLocalizedString(int message_id, CefString& string) override;
bool GetDataResource(int resource_id, void*& data,
size_t& data_size) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,18 +31,17 @@ class CefResourceHandlerCToCpp
explicit CefResourceHandlerCToCpp(cef_resource_handler_t* str)
: CefCToCpp<CefResourceHandlerCToCpp, CefResourceHandler,
cef_resource_handler_t>(str) {}
virtual ~CefResourceHandlerCToCpp() {}
// CefResourceHandler methods
virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
CefRefPtr<CefCallback> callback) OVERRIDE;
virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length, CefString& redirectUrl) OVERRIDE;
virtual bool ReadResponse(void* data_out, int bytes_to_read, int& bytes_read,
CefRefPtr<CefCallback> callback) OVERRIDE;
virtual bool CanGetCookie(const CefCookie& cookie) OVERRIDE;
virtual bool CanSetCookie(const CefCookie& cookie) OVERRIDE;
virtual void Cancel() OVERRIDE;
bool ProcessRequest(CefRefPtr<CefRequest> request,
CefRefPtr<CefCallback> callback) override;
void GetResponseHeaders(CefRefPtr<CefResponse> response,
int64& response_length, CefString& redirectUrl) override;
bool ReadResponse(void* data_out, int bytes_to_read, int& bytes_read,
CefRefPtr<CefCallback> callback) override;
bool CanGetCookie(const CefCookie& cookie) override;
bool CanSetCookie(const CefCookie& cookie) override;
void Cancel() override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,7 +29,6 @@ class CefResponseCToCpp
public:
explicit CefResponseCToCpp(cef_response_t* str)
: CefCToCpp<CefResponseCToCpp, CefResponse, cef_response_t>(str) {}
virtual ~CefResponseCToCpp() {}
// CefResponse methods
virtual bool IsReadOnly() OVERRIDE;

View File

@@ -34,11 +34,10 @@ class CefRunFileDialogCallbackCToCpp
explicit CefRunFileDialogCallbackCToCpp(cef_run_file_dialog_callback_t* str)
: CefCToCpp<CefRunFileDialogCallbackCToCpp, CefRunFileDialogCallback,
cef_run_file_dialog_callback_t>(str) {}
virtual ~CefRunFileDialogCallbackCToCpp() {}
// CefRunFileDialogCallback methods
virtual void OnFileDialogDismissed(CefRefPtr<CefBrowserHost> browser_host,
const std::vector<CefString>& file_paths) OVERRIDE;
void OnFileDialogDismissed(CefRefPtr<CefBrowserHost> browser_host,
const std::vector<CefString>& file_paths) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,12 +31,11 @@ class CefSchemeHandlerFactoryCToCpp
explicit CefSchemeHandlerFactoryCToCpp(cef_scheme_handler_factory_t* str)
: CefCToCpp<CefSchemeHandlerFactoryCToCpp, CefSchemeHandlerFactory,
cef_scheme_handler_factory_t>(str) {}
virtual ~CefSchemeHandlerFactoryCToCpp() {}
// CefSchemeHandlerFactory methods
virtual CefRefPtr<CefResourceHandler> Create(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefResourceHandler> Create(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, const CefString& scheme_name,
CefRefPtr<CefRequest> request) OVERRIDE;
CefRefPtr<CefRequest> request) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,7 +31,6 @@ class CefSchemeRegistrarCToCpp
explicit CefSchemeRegistrarCToCpp(cef_scheme_registrar_t* str)
: CefCToCpp<CefSchemeRegistrarCToCpp, CefSchemeRegistrar,
cef_scheme_registrar_t>(str) {}
virtual ~CefSchemeRegistrarCToCpp() {}
// CefSchemeRegistrar methods
virtual bool AddCustomScheme(const CefString& scheme_name, bool is_standard,

View File

@@ -31,7 +31,6 @@ class CefStreamReaderCToCpp
explicit CefStreamReaderCToCpp(cef_stream_reader_t* str)
: CefCToCpp<CefStreamReaderCToCpp, CefStreamReader, cef_stream_reader_t>(
str) {}
virtual ~CefStreamReaderCToCpp() {}
// CefStreamReader methods
virtual size_t Read(void* ptr, size_t size, size_t n) OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefStreamWriterCToCpp
explicit CefStreamWriterCToCpp(cef_stream_writer_t* str)
: CefCToCpp<CefStreamWriterCToCpp, CefStreamWriter, cef_stream_writer_t>(
str) {}
virtual ~CefStreamWriterCToCpp() {}
// CefStreamWriter methods
virtual size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE;

View File

@@ -31,10 +31,9 @@ class CefStringVisitorCToCpp
explicit CefStringVisitorCToCpp(cef_string_visitor_t* str)
: CefCToCpp<CefStringVisitorCToCpp, CefStringVisitor,
cef_string_visitor_t>(str) {}
virtual ~CefStringVisitorCToCpp() {}
// CefStringVisitor methods
virtual void Visit(const CefString& string) OVERRIDE;
void Visit(const CefString& string) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,10 +29,9 @@ class CefTaskCToCpp
public:
explicit CefTaskCToCpp(cef_task_t* str)
: CefCToCpp<CefTaskCToCpp, CefTask, cef_task_t>(str) {}
virtual ~CefTaskCToCpp() {}
// CefTask methods
virtual void Execute() OVERRIDE;
void Execute() override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,7 +29,6 @@ class CefTaskRunnerCToCpp
public:
explicit CefTaskRunnerCToCpp(cef_task_runner_t* str)
: CefCToCpp<CefTaskRunnerCToCpp, CefTaskRunner, cef_task_runner_t>(str) {}
virtual ~CefTaskRunnerCToCpp() {}
// CefTaskRunner methods
virtual bool IsSame(CefRefPtr<CefTaskRunner> that) OVERRIDE;

View File

@@ -31,19 +31,18 @@ class CefURLRequestClientCToCpp
explicit CefURLRequestClientCToCpp(cef_urlrequest_client_t* str)
: CefCToCpp<CefURLRequestClientCToCpp, CefURLRequestClient,
cef_urlrequest_client_t>(str) {}
virtual ~CefURLRequestClientCToCpp() {}
// CefURLRequestClient methods
virtual void OnRequestComplete(CefRefPtr<CefURLRequest> request) OVERRIDE;
virtual void OnUploadProgress(CefRefPtr<CefURLRequest> request,
uint64 current, uint64 total) OVERRIDE;
virtual void OnDownloadProgress(CefRefPtr<CefURLRequest> request,
uint64 current, uint64 total) OVERRIDE;
virtual void OnDownloadData(CefRefPtr<CefURLRequest> request,
const void* data, size_t data_length) OVERRIDE;
virtual bool GetAuthCredentials(bool isProxy, const CefString& host, int port,
void OnRequestComplete(CefRefPtr<CefURLRequest> request) override;
void OnUploadProgress(CefRefPtr<CefURLRequest> request, uint64 current,
uint64 total) override;
void OnDownloadProgress(CefRefPtr<CefURLRequest> request, uint64 current,
uint64 total) override;
void OnDownloadData(CefRefPtr<CefURLRequest> request, const void* data,
size_t data_length) override;
bool GetAuthCredentials(bool isProxy, const CefString& host, int port,
const CefString& realm, const CefString& scheme,
CefRefPtr<CefAuthCallback> callback) OVERRIDE;
CefRefPtr<CefAuthCallback> callback) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,7 +29,6 @@ class CefURLRequestCToCpp
public:
explicit CefURLRequestCToCpp(cef_urlrequest_t* str)
: CefCToCpp<CefURLRequestCToCpp, CefURLRequest, cef_urlrequest_t>(str) {}
virtual ~CefURLRequestCToCpp() {}
// CefURLRequest methods
virtual CefRefPtr<CefRequest> GetRequest() OVERRIDE;

View File

@@ -29,13 +29,12 @@ class CefV8AccessorCToCpp
public:
explicit CefV8AccessorCToCpp(cef_v8accessor_t* str)
: CefCToCpp<CefV8AccessorCToCpp, CefV8Accessor, cef_v8accessor_t>(str) {}
virtual ~CefV8AccessorCToCpp() {}
// CefV8Accessor methods
virtual bool Get(const CefString& name, const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval, CefString& exception) OVERRIDE;
virtual bool Set(const CefString& name, const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value, CefString& exception) OVERRIDE;
bool Get(const CefString& name, const CefRefPtr<CefV8Value> object,
CefRefPtr<CefV8Value>& retval, CefString& exception) override;
bool Set(const CefString& name, const CefRefPtr<CefV8Value> object,
const CefRefPtr<CefV8Value> value, CefString& exception) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,7 +29,6 @@ class CefV8ContextCToCpp
public:
explicit CefV8ContextCToCpp(cef_v8context_t* str)
: CefCToCpp<CefV8ContextCToCpp, CefV8Context, cef_v8context_t>(str) {}
virtual ~CefV8ContextCToCpp() {}
// CefV8Context methods
virtual CefRefPtr<CefTaskRunner> GetTaskRunner() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefV8ExceptionCToCpp
explicit CefV8ExceptionCToCpp(cef_v8exception_t* str)
: CefCToCpp<CefV8ExceptionCToCpp, CefV8Exception, cef_v8exception_t>(
str) {}
virtual ~CefV8ExceptionCToCpp() {}
// CefV8Exception methods
virtual CefString GetMessage() OVERRIDE;

View File

@@ -29,12 +29,11 @@ class CefV8HandlerCToCpp
public:
explicit CefV8HandlerCToCpp(cef_v8handler_t* str)
: CefCToCpp<CefV8HandlerCToCpp, CefV8Handler, cef_v8handler_t>(str) {}
virtual ~CefV8HandlerCToCpp() {}
// CefV8Handler methods
virtual bool Execute(const CefString& name, CefRefPtr<CefV8Value> object,
bool Execute(const CefString& name, CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval,
CefString& exception) OVERRIDE;
CefString& exception) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,7 +31,6 @@ class CefV8StackFrameCToCpp
explicit CefV8StackFrameCToCpp(cef_v8stack_frame_t* str)
: CefCToCpp<CefV8StackFrameCToCpp, CefV8StackFrame, cef_v8stack_frame_t>(
str) {}
virtual ~CefV8StackFrameCToCpp() {}
// CefV8StackFrame methods
virtual bool IsValid() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefV8StackTraceCToCpp
explicit CefV8StackTraceCToCpp(cef_v8stack_trace_t* str)
: CefCToCpp<CefV8StackTraceCToCpp, CefV8StackTrace, cef_v8stack_trace_t>(
str) {}
virtual ~CefV8StackTraceCToCpp() {}
// CefV8StackTrace methods
virtual bool IsValid() OVERRIDE;

View File

@@ -30,7 +30,6 @@ class CefV8ValueCToCpp
public:
explicit CefV8ValueCToCpp(cef_v8value_t* str)
: CefCToCpp<CefV8ValueCToCpp, CefV8Value, cef_v8value_t>(str) {}
virtual ~CefV8ValueCToCpp() {}
// CefV8Value methods
virtual bool IsValid() OVERRIDE;

View File

@@ -31,7 +31,6 @@ class CefWebPluginInfoCToCpp
explicit CefWebPluginInfoCToCpp(cef_web_plugin_info_t* str)
: CefCToCpp<CefWebPluginInfoCToCpp, CefWebPluginInfo,
cef_web_plugin_info_t>(str) {}
virtual ~CefWebPluginInfoCToCpp() {}
// CefWebPluginInfo methods
virtual CefString GetName() OVERRIDE;

View File

@@ -31,11 +31,9 @@ class CefWebPluginInfoVisitorCToCpp
explicit CefWebPluginInfoVisitorCToCpp(cef_web_plugin_info_visitor_t* str)
: CefCToCpp<CefWebPluginInfoVisitorCToCpp, CefWebPluginInfoVisitor,
cef_web_plugin_info_visitor_t>(str) {}
virtual ~CefWebPluginInfoVisitorCToCpp() {}
// CefWebPluginInfoVisitor methods
virtual bool Visit(CefRefPtr<CefWebPluginInfo> info, int count,
int total) OVERRIDE;
bool Visit(CefRefPtr<CefWebPluginInfo> info, int count, int total) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -33,10 +33,9 @@ class CefWebPluginUnstableCallbackCToCpp
: CefCToCpp<CefWebPluginUnstableCallbackCToCpp,
CefWebPluginUnstableCallback, cef_web_plugin_unstable_callback_t>(
str) {}
virtual ~CefWebPluginUnstableCallbackCToCpp() {}
// CefWebPluginUnstableCallback methods
virtual void IsUnstable(const CefString& path, bool unstable) OVERRIDE;
void IsUnstable(const CefString& path, bool unstable) override;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -31,14 +31,13 @@ class CefWriteHandlerCToCpp
explicit CefWriteHandlerCToCpp(cef_write_handler_t* str)
: CefCToCpp<CefWriteHandlerCToCpp, CefWriteHandler, cef_write_handler_t>(
str) {}
virtual ~CefWriteHandlerCToCpp() {}
// CefWriteHandler methods
virtual size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE;
virtual int Seek(int64 offset, int whence) OVERRIDE;
virtual int64 Tell() OVERRIDE;
virtual int Flush() OVERRIDE;
virtual bool MayBlock() OVERRIDE;
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;
};
#endif // BUILDING_CEF_SHARED

View File

@@ -29,7 +29,6 @@ class CefXmlReaderCToCpp
public:
explicit CefXmlReaderCToCpp(cef_xml_reader_t* str)
: CefCToCpp<CefXmlReaderCToCpp, CefXmlReader, cef_xml_reader_t>(str) {}
virtual ~CefXmlReaderCToCpp() {}
// CefXmlReader methods
virtual bool MoveToNextNode() OVERRIDE;

View File

@@ -29,7 +29,6 @@ class CefZipReaderCToCpp
public:
explicit CefZipReaderCToCpp(cef_zip_reader_t* str)
: CefCToCpp<CefZipReaderCToCpp, CefZipReader, cef_zip_reader_t>(str) {}
virtual ~CefZipReaderCToCpp() {}
// CefZipReader methods
virtual bool MoveToFirstFile() OVERRIDE;