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

Unified Diff: gpu/gpu_plugin/gpu_plugin_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
« no previous file with comments | « gpu/gpu_plugin/gpu_plugin_object_unittest.cc ('k') | gpu/np_utils/np_browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu_plugin/gpu_plugin_unittest.cc
===================================================================
--- gpu/gpu_plugin/gpu_plugin_unittest.cc (revision 32865)
+++ gpu/gpu_plugin/gpu_plugin_unittest.cc (working copy)
@@ -8,12 +8,7 @@
#include "gpu/np_utils/np_plugin_object_factory_mock.h"
#include "gpu/np_utils/np_plugin_object_mock.h"
#include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(O3D_IN_CHROME)
#include "webkit/glue/plugins/nphostapi.h"
-#else
-#include "o3d/third_party/npapi/include/npfunctions.h"
-#endif
#if defined(OS_LINUX)
#define INITIALIZE_PLUGIN_FUNCS , &plugin_funcs_
« no previous file with comments | « gpu/gpu_plugin/gpu_plugin_object_unittest.cc ('k') | gpu/np_utils/np_browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698