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

Side by Side Diff: content/test/plugin/plugin_windowless_test.cc

Issue 19697013: Move NPAPI test plugin to content/test/plugin. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « content/test/plugin/plugin_windowless_test.h ('k') | content/test/plugin/resource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #define STRSAFE_NO_DEPRECATE 5 #define STRSAFE_NO_DEPRECATE
6 6
7 #include "webkit/plugins/npapi/test/plugin_windowless_test.h" 7 #include "content/test/plugin/plugin_windowless_test.h"
8 8
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "webkit/plugins/npapi/test/plugin_client.h" 11 #include "content/test/plugin/plugin_client.h"
12 12
13 #if defined(TOOLKIT_GTK) 13 #if defined(TOOLKIT_GTK)
14 #include <gdk/gdkx.h> 14 #include <gdk/gdkx.h>
15 #endif 15 #endif
16 16
17 // NPEvent does not exist on the Mac. 17 // NPEvent does not exist on the Mac.
18 #if defined(OS_MACOSX) 18 #if defined(OS_MACOSX)
19 typedef NPCocoaEvent WindowlessPluginTestEvent; 19 typedef NPCocoaEvent WindowlessPluginTestEvent;
20 #else 20 #else
21 typedef NPEvent WindowlessPluginTestEvent; 21 typedef NPEvent WindowlessPluginTestEvent;
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 error_string.append(StringForPoint(flipped_window_x, flipped_window_y)); 312 error_string.append(StringForPoint(flipped_window_x, flipped_window_y));
313 SetError(error_string); 313 SetError(error_string);
314 } 314 }
315 #else 315 #else
316 SetError("Unimplemented"); 316 SetError("Unimplemented");
317 #endif 317 #endif
318 SignalTestCompleted(); 318 SignalTestCompleted();
319 } 319 }
320 320
321 } // namespace NPAPIClient 321 } // namespace NPAPIClient
OLDNEW
« no previous file with comments | « content/test/plugin/plugin_windowless_test.h ('k') | content/test/plugin/resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698