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

chrome/plugin/webplugin_proxy.h

Index: chrome/plugin/webplugin_proxy.h
===================================================================
--- chrome/plugin/webplugin_proxy.h	(revision 21731)
+++ chrome/plugin/webplugin_proxy.h	(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.
 
@@ -88,6 +88,9 @@
   // object with that id exists.
   WebPluginResourceClient* GetResourceClient(int id);
 
+  // Returns the process id of the renderer that contains this plugin.
+  int GetRendererProcessId();
+
   // For windowless plugins, paints the given rectangle into the local buffer.
   void Paint(const gfx::Rect& rect);
 
Property changes on: chrome\plugin\webplugin_proxy.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/plugin/webplugin_proxy.h:r21437