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

Side by Side Diff: gpu/gpu_plugin/gpu_plugin.cc

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/plugin.h ('k') | gpu/pgl/command_buffer_pepper.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #if defined(OS_WIN) 5 #if defined(OS_WIN)
6 #include <windows.h> 6 #include <windows.h>
7 #endif 7 #endif
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "gpu/gpu_plugin/gpu_plugin.h" 11 #include "gpu/gpu_plugin/gpu_plugin.h"
12 #include "webkit/glue/plugins/nphostapi.h" 12 #include "third_party/npapi/bindings/nphostapi.h"
13 13
14 namespace gpu_plugin { 14 namespace gpu_plugin {
15 15
16 // Definitions of NPAPI plugin entry points. 16 // Definitions of NPAPI plugin entry points.
17 17
18 namespace { 18 namespace {
19 19
20 // TODO(apatrick): move this to platform specific source files. 20 // TODO(apatrick): move this to platform specific source files.
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 class PluginObject { 22 class PluginObject {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 #endif 134 #endif
135 135
136 return NPERR_NO_ERROR; 136 return NPERR_NO_ERROR;
137 } 137 }
138 138
139 NPError API_CALL NP_Shutdown() { 139 NPError API_CALL NP_Shutdown() {
140 return NPERR_NO_ERROR; 140 return NPERR_NO_ERROR;
141 } 141 }
142 142
143 } // namespace gpu_plugin 143 } // namespace gpu_plugin
OLDNEW
« no previous file with comments | « gpu/demos/framework/plugin.h ('k') | gpu/pgl/command_buffer_pepper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698