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

Side by Side Diff: content/shell/tools/plugin/Tests/NPRuntimeRemoveProperty.cpp

Issue 629143003: Replace OVERRIDE and FINAL with override and final in content/shell/[a-s]* (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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 m_testObject = TestObject::create(pluginTest()); 152 m_testObject = TestObject::create(pluginTest());
153 153
154 OBJECT_TO_NPVARIANT(pluginTest()->NPN_RetainObject(m_testObject), *r esult); 154 OBJECT_TO_NPVARIANT(pluginTest()->NPN_RetainObject(m_testObject), *r esult);
155 return true; 155 return true;
156 } 156 }
157 157
158 private: 158 private:
159 NPObject* m_testObject; 159 NPObject* m_testObject;
160 }; 160 };
161 161
162 virtual NPError NPP_GetValue(NPPVariable variable, void* value) OVERRIDE { 162 virtual NPError NPP_GetValue(NPPVariable variable, void* value) override {
163 if (variable != NPPVpluginScriptableNPObject) 163 if (variable != NPPVpluginScriptableNPObject)
164 return NPERR_GENERIC_ERROR; 164 return NPERR_GENERIC_ERROR;
165 165
166 *(NPObject**)value = PluginObject::create(this); 166 *(NPObject**)value = PluginObject::create(this);
167 167
168 return NPERR_NO_ERROR; 168 return NPERR_NO_ERROR;
169 } 169 }
170 170
171 }; 171 };
172 172
173 static PluginTest::Register<NPRuntimeRemoveProperty> npRuntimeRemoveProperty("np runtime-remove-property"); 173 static PluginTest::Register<NPRuntimeRemoveProperty> npRuntimeRemoveProperty("np runtime-remove-property");
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698