gpu/gpu_plugin/gpu_plugin_object_unittest.cc - Issue 436017: Branched gpu process and command buffer code into Chrome tree. Fixed up paths...

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

Unified Diff: gpu/gpu_plugin/gpu_plugin_object_unittest.cc

Issue 436017: Branched gpu process and command buffer code into Chrome tree. Fixed up paths... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 1 month 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 side-by-side diff with in-line comments

Download patch

Index: gpu/gpu_plugin/gpu_plugin_object_unittest.cc

===================================================================

--- gpu/gpu_plugin/gpu_plugin_object_unittest.cc (revision 32865)

+++ gpu/gpu_plugin/gpu_plugin_object_unittest.cc (working copy)

@@ -11,12 +11,7 @@

#include "gpu/np_utils/np_object_pointer.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "testing/gmock/include/gmock/gmock.h"

-#if defined(O3D_IN_CHROME)

#include "webkit/glue/plugins/nphostapi.h"

-#else

-#include "o3d/third_party/npapi/include/npfunctions.h"

-#endif

using ::base::SharedMemory;

using command_buffer::GPUProcessor;

« no previous file with comments | « gpu/gpu_plugin/gpu_plugin.cc ('k') | gpu/gpu_plugin/gpu_plugin_unittest.cc » ('j') | no next file with comments »