Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp

Issue 671663002: Standardize usage of virtual/override/final in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
diff --git a/content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp b/content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
index 492536b32534727ad73a71ca86c23d5dfc74f888..f98ef5c0662797251164a599c23ed47c7404f2ee 100644
--- a/content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
+++ b/content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
@@ -44,8 +44,7 @@ private:
// This is the test object.
class TestObject : public Object<TestObject> {
public:
- virtual ~TestObject()
- {
+ ~TestObject() override {
if (wasShutdownCalled)
indicateTestFailure();
}
@@ -70,19 +69,18 @@ private:
}
};
- virtual NPError NPP_New(NPMIMEType pluginType,
- uint16_t mode,
- int16_t argc,
- char* argn[],
- char* argv[],
- NPSavedData* saved) override {
+ NPError NPP_New(NPMIMEType pluginType,
+ uint16_t mode,
+ int16_t argc,
+ char* argn[],
+ char* argv[],
+ NPSavedData* saved) override {
registerNPShutdownFunction(shutdown);
return NPERR_NO_ERROR;
}
- virtual NPError NPP_GetValue(NPPVariable variable, void *value) override
- {
+ NPError NPP_GetValue(NPPVariable variable, void* value) override {
if (variable != NPPVpluginScriptableNPObject)
return NPERR_GENERIC_ERROR;
« no previous file with comments | « content/shell/tools/plugin/Tests/LogNPPSetWindow.cpp ('k') | content/shell/tools/plugin/Tests/NPPNewFails.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698