Merge 21437 - CPAPI (0.11) for gears drag drop....

chrome/plugin/webplugin_proxy.cc

Index: chrome/plugin/webplugin_proxy.cc
===================================================================
--- chrome/plugin/webplugin_proxy.cc	(revision 21731)
+++ chrome/plugin/webplugin_proxy.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -247,6 +247,12 @@
   return iterator->second;
 }
 
+int WebPluginProxy::GetRendererProcessId() {
+  if (channel_.get())
+    return channel_->peer_pid();
+  return 0;
+}
+
 void WebPluginProxy::DidPaint() {
   // If we have an accumulated damaged rect, then check to see if we need to
   // send out another InvalidateRect message.
Property changes on: chrome\plugin\webplugin_proxy.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/chrome/plugin/webplugin_proxy.cc:r21437
   Merged /branches/chrome_webkit_merge_branch/chrome/plugin/webplugin_proxy.cc:r69-2775