From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 24 May 2011 11:24:40 +0100
Subject: Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
---
 Source/WebKit2/PluginProcess/WebProcessConnection.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Source/WebKit2/PluginProcess/WebProcessConnection.h')

diff --git a/Source/WebKit2/PluginProcess/WebProcessConnection.h b/Source/WebKit2/PluginProcess/WebProcessConnection.h
index d965e49..4953e61 100644
--- a/Source/WebKit2/PluginProcess/WebProcessConnection.h
+++ b/Source/WebKit2/PluginProcess/WebProcessConnection.h
@@ -45,14 +45,14 @@ public:
     virtual ~WebProcessConnection();
 
     CoreIPC::Connection* connection() const { return m_connection.get(); }
-
     NPRemoteObjectMap* npRemoteObjectMap() const { return m_npRemoteObjectMap.get(); }
 
+    void removePluginControllerProxy(PluginControllerProxy*);
+
 private:
     WebProcessConnection(CoreIPC::Connection::Identifier);
 
     void addPluginControllerProxy(PassOwnPtr<PluginControllerProxy>);
-    void removePluginControllerProxy(PluginControllerProxy*);
 
     void destroyPluginControllerProxy(PluginControllerProxy*);
 
-- 
cgit v1.1