Revert all of my patches from today.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19328 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 29 deletions

diff --git a/chrome/common/ipc_message_utils.h b/chrome/common/ipc_message_utils.h
index 8c50d6e..2ae2ab5 100644
--- a/chrome/common/ipc_message_utils.h
+++ b/chrome/common/ipc_message_utils.h
@@ -176,25 +176,6 @@ struct ParamTraits<long> {
   }
 };
 
-// unsigned long is used for serializing X window ids.
-template <>
-struct ParamTraits<unsigned long> {
-  typedef unsigned long param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteLong(p);
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    long read_output;
-    if (!m->ReadLong(iter, &read_output))
-      return false;
-    *r = static_cast<unsigned long>(read_output);
-    return true;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    l->append(StringPrintf(L"%ul", p));
-  }
-};
-
 template <>
 struct ParamTraits<size_t> {
   typedef size_t param_type;
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 57c07fc..286659b 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -56,21 +56,15 @@ bool WebPluginProxy::Send(IPC::Message* msg) {
   return channel_->Send(msg);
 }
 
-void WebPluginProxy::SetWindow(gfx::PluginWindowHandle window) {
-#if defined(OS_WIN)
+void WebPluginProxy::SetWindow(gfx::NativeView window) {
   Send(new PluginHostMsg_SetWindow(route_id_, gfx::IdFromNativeView(window)));
-#else
-  NOTIMPLEMENTED();
-#endif
 }
 
-void WebPluginProxy::WillDestroyWindow(gfx::PluginWindowHandle window) {
+void WebPluginProxy::WillDestroyWindow(gfx::NativeView window) {
 #if defined(OS_WIN)
   PluginThread::current()->Send(
       new PluginProcessHostMsg_PluginWindowDestroyed(
           window, ::GetParent(window)));
-#else
-  NOTIMPLEMENTED();
 #endif
 }
 
diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h
index e143297..46c16d1 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/chrome/plugin/webplugin_proxy.h
@@ -37,8 +37,8 @@ class WebPluginProxy : public WebPlugin {
   ~WebPluginProxy();
 
   // WebPlugin overrides
-  void SetWindow(gfx::PluginWindowHandle window);
-  void WillDestroyWindow(gfx::PluginWindowHandle window);
+  void SetWindow(gfx::NativeView window);
+  void WillDestroyWindow(gfx::NativeView window);
 #if defined(OS_WIN)
   void SetWindowlessPumpEvent(HANDLE pump_messages_event);
   // Returns true on success.