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

Side by Side Diff: chrome/plugin/npobject_proxy.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/common/webmessageportchannel_impl.cc ('k') | chrome/plugin/npobject_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_proxy.h" 5 #include "chrome/plugin/npobject_proxy.h"
6 6
7 #include "chrome/common/plugin_messages.h" 7 #include "chrome/common/plugin_messages.h"
8 #include "chrome/plugin/npobject_util.h" 8 #include "chrome/plugin/npobject_util.h"
9 #include "chrome/plugin/plugin_channel.h" 9 #include "chrome/plugin/plugin_channel.h"
10 #include "webkit/api/public/WebBindings.h" 10 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
11 #include "webkit/glue/webkit_glue.h" 11 #include "webkit/glue/webkit_glue.h"
12 #include "webkit/glue/plugins/plugin_instance.h" 12 #include "webkit/glue/plugins/plugin_instance.h"
13 13
14 using WebKit::WebBindings; 14 using WebKit::WebBindings;
15 15
16 struct NPObjectWrapper { 16 struct NPObjectWrapper {
17 NPObject object; 17 NPObject object;
18 NPObjectProxy* proxy; 18 NPObjectProxy* proxy;
19 }; 19 };
20 20
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 return; 492 return;
493 } 493 }
494 494
495 NPVariant_Param result_param; 495 NPVariant_Param result_param;
496 std::string message_str(message); 496 std::string message_str(message);
497 497
498 proxy->Send(new NPObjectMsg_SetException(proxy->route_id(), message_str)); 498 proxy->Send(new NPObjectMsg_SetException(proxy->route_id(), message_str));
499 // Send may delete proxy. 499 // Send may delete proxy.
500 proxy = NULL; 500 proxy = NULL;
501 } 501 }
OLDNEW
« no previous file with comments | « chrome/common/webmessageportchannel_impl.cc ('k') | chrome/plugin/npobject_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698