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

Side by Side Diff: chrome/plugin/npobject_util.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)
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 unified diff | Download patch
« no previous file with comments | « chrome/plugin/npobject_stub.cc ('k') | chrome/plugin/webplugin_delegate_stub.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "chrome/plugin/npobject_util.h" 5 #include "chrome/plugin/npobject_util.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "chrome/common/plugin_messages.h" 8 #include "chrome/common/plugin_messages.h"
9 #include "chrome/plugin/npobject_proxy.h" 9 #include "chrome/plugin/npobject_proxy.h"
10 #include "chrome/plugin/plugin_channel_base.h" 10 #include "chrome/plugin/plugin_channel_base.h"
11 #include "webkit/api/public/WebBindings.h" 11 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
12 #include "webkit/glue/plugins/nphostapi.h" 12 #include "webkit/glue/plugins/nphostapi.h"
13 #include "webkit/glue/plugins/plugin_host.h" 13 #include "webkit/glue/plugins/plugin_host.h"
14 #include "webkit/glue/webkit_glue.h" 14 #include "webkit/glue/webkit_glue.h"
15 15
16 using WebKit::WebBindings; 16 using WebKit::WebBindings;
17 17
18 // true if the current process is a plugin process, false if it's a renderer 18 // true if the current process is a plugin process, false if it's a renderer
19 // process. 19 // process.
20 static bool g_plugin_process; 20 static bool g_plugin_process;
21 21
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 case NPVARIANT_PARAM_OBJECT_POINTER: 249 case NPVARIANT_PARAM_OBJECT_POINTER:
250 result->type = NPVariantType_Object; 250 result->type = NPVariantType_Object;
251 result->value.objectValue = 251 result->value.objectValue =
252 reinterpret_cast<NPObject*>(param.npobject_pointer); 252 reinterpret_cast<NPObject*>(param.npobject_pointer);
253 WebBindings::retainObject(result->value.objectValue); 253 WebBindings::retainObject(result->value.objectValue);
254 break; 254 break;
255 default: 255 default:
256 NOTREACHED(); 256 NOTREACHED();
257 } 257 }
258 } 258 }
OLDNEW
« no previous file with comments | « chrome/plugin/npobject_stub.cc ('k') | chrome/plugin/webplugin_delegate_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698