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

@@ -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