POSIX: gfx::NativeViewId and CrossProcessEvent

chrome/browser/renderer_host/render_view_host.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <vector>
 
+#include "base/gfx/native_widget_types.h"
 #include "base/string_util.h"
 #include "base/waitable_event.h"
 #include "chrome/app/result_codes.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cross_site_request_manager.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
@@ skipping 102 matching lines @@
   // initialized it) or may not (we have our own process or the old process
   // crashed) have been initialized. Calling Init multiple times will be
   // ignored, so this is safe.
   if (!process()->Init())
     return false;
   DCHECK(process()->channel());
   DCHECK(process()->profile());
 
   renderer_initialized_ = true;
 
-  HANDLE modal_dialog_event;
+#if defined(OS_WIN)
+  HANDLE modal_dialog_event_handle;
   HANDLE renderer_process_handle = process()->process().handle();
   if (renderer_process_handle == NULL)
     renderer_process_handle = GetCurrentProcess();
 
   BOOL result = DuplicateHandle(GetCurrentProcess(),
       modal_dialog_event_->handle(),
       renderer_process_handle,
-      &modal_dialog_event,
+      &modal_dialog_event_handle,
       SYNCHRONIZE,
       FALSE,
       0);
   DCHECK(result) << "Couldn't duplicate the modal dialog handle for the renderer.";
+#endif
 
   DCHECK(view());
-  Send(new ViewMsg_New(view()->GetPluginHWND(),
+
+  ModalDialogEvent modal_dialog_event;
+#if defined(OS_WIN)
+  modal_dialog_event.event = modal_dialog_event_handle;
+#endif
+
+  Send(new ViewMsg_New(gfx::IdFromNativeView(view()->GetPluginHWND()),
                        modal_dialog_event,
                        delegate_->GetWebkitPrefs(),
                        routing_id()));
 
   // Set the alternate error page, which is profile specific, in the renderer.
   GURL url = delegate_->GetAlternateErrorPageURL();
   SetAlternateErrorPageURL(url);
 
   // If it's enabled, tell the renderer to set up the Javascript bindings for
   // sending messages back to the browser.
@@ skipping 586 matching lines @@
   if (run_modal_reply_msg_) {
     if (--modal_dialog_count_ == 0)
       modal_dialog_event_->Reset();
     Send(run_modal_reply_msg_);
     run_modal_reply_msg_ = NULL;
   }
   RenderWidgetHost::Shutdown();
 }
 
 void RenderViewHost::OnMsgCreateWindow(int route_id,
-                                       HANDLE modal_dialog_event) {
+                                       ModalDialogEvent modal_dialog_event) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
+  base::WaitableEvent* waitable_event = new base::WaitableEvent(
+#if defined(OS_WIN)
+      modal_dialog_event.event);
+#else
+      true, false);
+#endif
+
   if (view)
-    view->CreateNewWindow(route_id,
-                          new base::WaitableEvent(modal_dialog_event));
+    view->CreateNewWindow(route_id, waitable_event);
 }
 
 void RenderViewHost::OnMsgCreateWidget(int route_id, bool activatable) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (view)
     view->CreateNewWidget(route_id, activatable);
 }
 
 void RenderViewHost::OnMsgShowView(int route_id,
                                    WindowOpenDisposition disposition,
@@ skipping 510 matching lines @@
                                                std::string event_arg) {
   Send(new ViewMsg_PersonalizationEvent(routing_id(), event_name, event_arg));
 }
 #endif
 
 void RenderViewHost::ForwardMessageFromExternalHost(
     const std::string& target, const std::string& message) {
   Send(new ViewMsg_HandleMessageFromExternalHost(routing_id(), target,
                                                  message));
 }