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

Side by Side Diff: content/shell/tools/plugin/Tests/NPRuntimeObjectFromDestroyedPlugin.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /* 5 /*
6 * Copyright (C) 2010 Apple Inc. All rights reserved. 6 * Copyright (C) 2010 Apple Inc. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 { 70 {
71 if (propertyName != pluginTest()->NPN_GetStringIdentifier("testObjec t")) 71 if (propertyName != pluginTest()->NPN_GetStringIdentifier("testObjec t"))
72 return false; 72 return false;
73 73
74 NPObject* testObject = TestObject::create(pluginTest()); 74 NPObject* testObject = TestObject::create(pluginTest());
75 OBJECT_TO_NPVARIANT(testObject, *result); 75 OBJECT_TO_NPVARIANT(testObject, *result);
76 return true; 76 return true;
77 } 77 }
78 }; 78 };
79 79
80 virtual NPError NPP_GetValue(NPPVariable variable, void *value) override 80 NPError NPP_GetValue(NPPVariable variable, void* value) override {
81 {
82 if (variable != NPPVpluginScriptableNPObject) 81 if (variable != NPPVpluginScriptableNPObject)
83 return NPERR_GENERIC_ERROR; 82 return NPERR_GENERIC_ERROR;
84 83
85 *(NPObject**)value = ScriptableObject::create(this); 84 *(NPObject**)value = ScriptableObject::create(this);
86 85
87 return NPERR_NO_ERROR; 86 return NPERR_NO_ERROR;
88 } 87 }
89 }; 88 };
90 89
91 static PluginTest::Register<NPRuntimeObjectFromDestroyedPlugin> npRuntimeObjectF romDestroyedPlugin("npruntime-object-from-destroyed-plugin"); 90 static PluginTest::Register<NPRuntimeObjectFromDestroyedPlugin> npRuntimeObjectF romDestroyedPlugin("npruntime-object-from-destroyed-plugin");
92 91
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698