webkit/plugins/npapi/test/plugin_windowless_test.cc - Issue 5996003: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 5996003: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi" (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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 #include "base/string_number_conversions.h"	6 #include "base/string_number_conversions.h"

7 #include "base/string_util.h"	7 #include "base/string_util.h"

8 #include "webkit/glue/plugins/test/plugin_windowless_test.h"	8 #include "webkit/plugins/npapi/test/plugin_windowless_test.h"

9 #include "webkit/glue/plugins/test/plugin_client.h"	9 #include "webkit/plugins/npapi/test/plugin_client.h"

10	10

11 #if defined(OS_MACOSX)	11 #if defined(OS_MACOSX)

12 #include <ApplicationServices/ApplicationServices.h>	12 #include <ApplicationServices/ApplicationServices.h>

13 #include <Carbon/Carbon.h>	13 #include <Carbon/Carbon.h>

14 #endif	14 #endif

15	15

16 namespace NPAPIClient {	16 namespace NPAPIClient {

17	17

18 // Remember the first plugin instance for tests involving multiple instances	18 // Remember the first plugin instance for tests involving multiple instances

19 WindowlessPluginTest* g_other_instance = NULL;	19 WindowlessPluginTest* g_other_instance = NULL;

(...skipping 232 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
252 error_string.append(StringForPoint(flipped_window_x, flipped_window_y));	252 error_string.append(StringForPoint(flipped_window_x, flipped_window_y));

253 SetError(error_string);	253 SetError(error_string);

254 }	254 }

255 #else	255 #else

256 SetError("Unimplemented");	256 SetError("Unimplemented");

257 #endif	257 #endif

258 SignalTestCompleted();	258 SignalTestCompleted();

259 }	259 }

260	260

261 } // namespace NPAPIClient	261 } // namespace NPAPIClient

OLD	NEW

« no previous file with comments | « webkit/plugins/npapi/test/plugin_windowless_test.h ('k') | webkit/plugins/npapi/test/resource.h » ('j') | no next file with comments »