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

Side by Side Diff: content/renderer/pepper/npapi_glue.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 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 | « content/renderer/pepper/npapi_glue.h ('k') | content/renderer/pepper/npobject_var.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "webkit/plugins/ppapi/npapi_glue.h" 5 #include "content/renderer/pepper/npapi_glue.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "content/renderer/pepper/host_array_buffer_var.h"
11 #include "content/renderer/pepper/host_globals.h"
12 #include "content/renderer/pepper/host_var_tracker.h"
13 #include "content/renderer/pepper/npobject_var.h"
14 #include "content/renderer/pepper/plugin_module.h"
15 #include "content/renderer/pepper/plugin_object.h"
16 #include "content/renderer/pepper/ppapi_plugin_instance_impl.h"
10 #include "ppapi/c/pp_var.h" 17 #include "ppapi/c/pp_var.h"
11 #include "third_party/npapi/bindings/npapi.h" 18 #include "third_party/npapi/bindings/npapi.h"
12 #include "third_party/npapi/bindings/npruntime.h" 19 #include "third_party/npapi/bindings/npruntime.h"
13 #include "third_party/WebKit/public/web/WebBindings.h" 20 #include "third_party/WebKit/public/web/WebBindings.h"
14 #include "third_party/WebKit/public/web/WebDocument.h" 21 #include "third_party/WebKit/public/web/WebDocument.h"
15 #include "third_party/WebKit/public/web/WebElement.h" 22 #include "third_party/WebKit/public/web/WebElement.h"
16 #include "third_party/WebKit/public/web/WebFrame.h" 23 #include "third_party/WebKit/public/web/WebFrame.h"
17 #include "third_party/WebKit/public/web/WebPluginContainer.h" 24 #include "third_party/WebKit/public/web/WebPluginContainer.h"
18 #include "v8/include/v8.h" 25 #include "v8/include/v8.h"
19 #include "webkit/plugins/ppapi/host_array_buffer_var.h"
20 #include "webkit/plugins/ppapi/host_globals.h"
21 #include "webkit/plugins/ppapi/host_var_tracker.h"
22 #include "webkit/plugins/ppapi/npobject_var.h"
23 #include "webkit/plugins/ppapi/plugin_module.h"
24 #include "webkit/plugins/ppapi/plugin_object.h"
25 #include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
26 26
27 using ppapi::NPObjectVar; 27 using ppapi::NPObjectVar;
28 using ppapi::PpapiGlobals; 28 using ppapi::PpapiGlobals;
29 using ppapi::StringVar; 29 using ppapi::StringVar;
30 using ppapi::Var; 30 using ppapi::Var;
31 using WebKit::WebArrayBuffer; 31 using WebKit::WebArrayBuffer;
32 using WebKit::WebBindings; 32 using WebKit::WebBindings;
33 using WebKit::WebPluginContainer; 33 using WebKit::WebPluginContainer;
34 34
35 namespace webkit { 35 namespace webkit {
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 } 348 }
349 } 349 }
350 350
351 // static 351 // static
352 void TryCatch::Catch(void* self, const char* message) { 352 void TryCatch::Catch(void* self, const char* message) {
353 static_cast<TryCatch*>(self)->SetException(message); 353 static_cast<TryCatch*>(self)->SetException(message);
354 } 354 }
355 355
356 } // namespace ppapi 356 } // namespace ppapi
357 } // namespace webkit 357 } // namespace webkit
OLDNEW
« no previous file with comments | « content/renderer/pepper/npapi_glue.h ('k') | content/renderer/pepper/npobject_var.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698