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

Side by Side Diff: gpu/demos/framework/plugin.h

Issue 1000001: Remove redundant nphostapi.h from webkit/glue/plugins, update source files as... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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 | « gpu/demos/framework/main_pepper.cc ('k') | gpu/gpu_plugin/gpu_plugin.cc » ('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) 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 #ifndef GPU_DEMOS_FRAMEWORK_PLUGIN_H_ 5 #ifndef GPU_DEMOS_FRAMEWORK_PLUGIN_H_
6 #define GPU_DEMOS_FRAMEWORK_PLUGIN_H_ 6 #define GPU_DEMOS_FRAMEWORK_PLUGIN_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/scoped_ptr.h" 9 #include "base/scoped_ptr.h"
10 #include "gpu/demos/framework/demo.h" 10 #include "gpu/demos/framework/demo.h"
11 #include "gpu/pgl/pgl.h" 11 #include "gpu/pgl/pgl.h"
12 #include "webkit/glue/plugins/nphostapi.h" 12 #include "third_party/npapi/bindings/nphostapi.h"
13 13
14 namespace gpu { 14 namespace gpu {
15 namespace demos { 15 namespace demos {
16 16
17 // Acts as a framework for pepper3d demos. It is in fact a pepper plugin with 17 // Acts as a framework for pepper3d demos. It is in fact a pepper plugin with
18 // a pepper3d device. It delegates all rendering tasks to demo object. 18 // a pepper3d device. It delegates all rendering tasks to demo object.
19 class Plugin : public NPObject { 19 class Plugin : public NPObject {
20 public: 20 public:
21 explicit Plugin(NPP npp); 21 explicit Plugin(NPP npp);
22 ~Plugin(); 22 ~Plugin();
(...skipping 26 matching lines...) Expand all
49 scoped_ptr<Demo> demo_; 49 scoped_ptr<Demo> demo_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(Plugin); 51 DISALLOW_COPY_AND_ASSIGN(Plugin);
52 }; 52 };
53 53
54 extern NPNetscapeFuncs* g_browser; 54 extern NPNetscapeFuncs* g_browser;
55 55
56 } // namespace demos 56 } // namespace demos
57 } // namespace gpu 57 } // namespace gpu
58 #endif // GPU_DEMOS_FRAMEWORK_PLUGIN_H_ 58 #endif // GPU_DEMOS_FRAMEWORK_PLUGIN_H_
OLDNEW
« no previous file with comments | « gpu/demos/framework/main_pepper.cc ('k') | gpu/gpu_plugin/gpu_plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698