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

Side by Side Diff: webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc

Issue 5961004: Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 7
8 #if defined(OS_WIN) 8 #if defined(OS_WIN)
9 #define STRSAFE_NO_DEPRECATE 9 #define STRSAFE_NO_DEPRECATE
10 #include <strsafe.h> 10 #include <strsafe.h>
11 #endif 11 #endif
12 #include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h" 12 #include "webkit/glue/plugins/test/plugin_npobject_proxy_test.h"
13 13
14 namespace NPAPIClient { 14 namespace NPAPIClient {
15 15
16 NPObjectProxyTest::NPObjectProxyTest(NPP id, NPNetscapeFuncs *host_functions) 16 NPObjectProxyTest::NPObjectProxyTest(NPP id, NPNetscapeFuncs *host_functions)
17 : PluginTest(id, host_functions) { 17 : PluginTest(id, host_functions) {
18 } 18 }
19 19
20 NPError NPObjectProxyTest::SetWindow(NPWindow* pNPWindow) { 20 NPError NPObjectProxyTest::SetWindow(NPWindow* pNPWindow) {
21 if (pNPWindow->window == NULL) 21 if (pNPWindow->window == NULL)
22 return NPERR_NO_ERROR; 22 return NPERR_NO_ERROR;
(...skipping 19 matching lines...) Expand all
42 NPVariant v; 42 NPVariant v;
43 HostFunctions()->invoke(id(), doc, append_child_id, &textv, 1, &v); 43 HostFunctions()->invoke(id(), doc, append_child_id, &textv, 1, &v);
44 44
45 // If this test failed, then we'd have crashed by now. 45 // If this test failed, then we'd have crashed by now.
46 SignalTestCompleted(); 46 SignalTestCompleted();
47 47
48 return NPERR_NO_ERROR; 48 return NPERR_NO_ERROR;
49 } 49 }
50 50
51 } // namespace NPAPIClient 51 } // namespace NPAPIClient
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/test/plugin_npobject_proxy_test.h ('k') | webkit/plugins/npapi/test/plugin_private_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698