Revert "Make render_view_host compile on Mac & Linux, add to the build."

Review URL: http://codereview.chromium.org/18796


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

6 files changed, 23 insertions, 39 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index cde1556..225d6fa 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -769,6 +769,7 @@ if not env.Bit('windows'):
       'printing/win_printing_context.cc',
       'profile.cc',
       'profile_manager.cc',
+      'renderer_host/render_view_host.cc',
       'renderer_host/render_widget_helper.cc',
       'renderer_host/render_widget_host.cc',
       'renderer_host/cross_site_resource_handler.cc',
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 15d9d63..adfebaa 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -22,6 +22,7 @@
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/thumbnail_score.h"
 #include "net/base/net_util.h"
@@ -77,13 +78,12 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
                                base::WaitableEvent* modal_dialog_event)
     : RenderWidgetHost(instance->GetProcess(), routing_id),
       instance_(instance),
+      enable_dom_ui_bindings_(false),
+      enable_external_host_bindings_(false),
       delegate_(delegate),
       renderer_initialized_(false),
       waiting_for_drag_context_response_(false),
       debugger_attached_(false),
-      enable_dom_ui_bindings_(false),
-      pending_request_id_(-1),
-      enable_external_host_bindings_(false),
       modal_dialog_count_(0),
       navigations_suspended_(false),
       suspended_nav_message_(NULL),
@@ -129,7 +129,6 @@ bool RenderViewHost::CreateRenderView() {
 
   renderer_initialized_ = true;
 
-#if defined(OS_WIN)
   HANDLE modal_dialog_event;
   HANDLE renderer_process_handle = process()->process().handle();
   if (renderer_process_handle == NULL)
@@ -149,9 +148,6 @@ bool RenderViewHost::CreateRenderView() {
                        modal_dialog_event,
                        delegate_->GetWebkitPrefs(),
                        routing_id()));
-#elif defined(OS_POSIX)
-  Send(new ViewMsg_New(delegate_->GetWebkitPrefs(), routing_id()));
-#endif
 
   // Set the alternate error page, which is profile specific, in the renderer.
   GURL url = delegate_->GetAlternateErrorPageURL();
@@ -754,21 +750,12 @@ void RenderViewHost::Shutdown() {
   RenderWidgetHost::Shutdown();
 }
 
-void RenderViewHost::OnMsgCreateWindow(
-    int route_id,
-    ModalDialogEvent modal_dialog_event) {
+void RenderViewHost::OnMsgCreateWindow(int route_id,
+                                       HANDLE modal_dialog_event) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
-  if (view) {
-#if defined(OS_WIN)
-    view->CreateNewWindow(route_id,
-                          new base::WaitableEvent(modal_dialog_event.event));
-#else
-    // TODO(port) this isn't correct, since we just make up an event won't ever
-    // be set by the renderer.
+  if (view)
     view->CreateNewWindow(route_id,
-                          new base::WaitableEvent(true, false));
-#endif
-  }
+                          new base::WaitableEvent(modal_dialog_event));
 }
 
 void RenderViewHost::OnMsgCreateWidget(int route_id, bool activatable) {
@@ -1083,6 +1070,7 @@ void RenderViewHost::OnMsgRunJavaScriptMessage(
   StopHangMonitorTimeout();
   if (modal_dialog_count_++ == 0)
     modal_dialog_event_->Signal();
+  bool did_suppress_message = false;
   delegate_->RunJavaScriptMessage(message, default_prompt, flags, reply_msg,
                                   &are_javascript_messages_suppressed_);
 }
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 36ec1d1..f4c40ed 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -12,11 +12,9 @@
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/page_zoom.h"
-#include "chrome/common/render_messages.h"
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
 #endif
-#include "net/base/load_states.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/autofill_form.h"
 
@@ -43,6 +41,10 @@ namespace gfx {
 class Point;
 }
 
+namespace net {
+enum LoadState;
+}
+
 namespace webkit_glue {
 struct WebApplicationInfo;
 }
@@ -414,7 +416,7 @@ class RenderViewHost : public RenderWidgetHost {
   virtual void NotifyRendererResponsive();
 
   // IPC message handlers.
-  void OnMsgCreateWindow(int route_id, ModalDialogEvent modal_dialog_event);
+  void OnMsgCreateWindow(int route_id, HANDLE modal_dialog_event);
   void OnMsgCreateWidget(int route_id, bool activatable);
   void OnMsgShowView(int route_id,
                      WindowOpenDisposition disposition,
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index 5a39b91..764e8ca 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -11,7 +11,6 @@
 #include "base/basictypes.h"
 #include "chrome/browser/autofill_manager.h"
 #include "chrome/common/render_messages.h"
-#include "net/base/load_states.h"
 #include "webkit/glue/webpreferences.h"
 
 class NavigationEntry;
@@ -35,6 +34,10 @@ namespace gfx {
 class Rect;
 }
 
+namespace net {
+enum LoadState;
+}
+
 //
 // RenderViewHostDelegate
 //
diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc
index 3e34340..d92ff301 100644
--- a/chrome/browser/renderer_host/render_widget_helper.cc
+++ b/chrome/browser/renderer_host/render_widget_helper.cc
@@ -204,10 +204,9 @@ void RenderWidgetHelper::CreateNewWindow(int opener_id,
   *route_id = GetNextRoutingID();
 
 #if defined(OS_WIN)
-  ModalDialogEvent event;
-  event.event = CreateEvent(NULL, TRUE, FALSE, NULL);
+  HANDLE event = CreateEvent(NULL, TRUE, FALSE, NULL);
   BOOL result = DuplicateHandle(GetCurrentProcess(),
-                                event.event,
+                                event,
                                 render_process,
                                 modal_dialog_event,
                                 SYNCHRONIZE,
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index 2e769ec..70d6cf5 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -5,19 +5,14 @@
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
 
+#include <windows.h>
+
 #include <vector>
 
 #include "base/gfx/size.h"
 #include "base/timer.h"
-#include "build/build_config.h"
 #include "chrome/common/ipc_channel.h"
 
-#if defined(OS_WIN)
-// TODO(port) when the bitmaps below use a cross-platform representation this
-// can be removed.
-#include <windows.h>
-#endif
-
 namespace gfx {
 class Rect;
 }
@@ -260,9 +255,6 @@ class RenderWidgetHost : public IPC::Channel::Listener {
   void OnMsgImeUpdateStatus(ViewHostMsg_ImeControl control,
                             const gfx::Rect& caret_rect);
 
-#if defined(OS_WIN)
-  // TODO(port) use a cross-platform representation of the bitmap.
-
   // Paints the given bitmap to the current backing store at the given location.
   void PaintBackingStoreRect(HANDLE bitmap,
                              const gfx::Rect& bitmap_rect,
@@ -276,8 +268,7 @@ class RenderWidgetHost : public IPC::Channel::Listener {
                               int dx, int dy,
                               const gfx::Rect& clip_rect,
                               const gfx::Size& view_size);
-#endif
-  
+
   // The View associated with the RenderViewHost. The lifetime of this object
   // is associated with the lifetime of the Render process. If the Renderer
   // crashes, its View is destroyed and this pointer becomes NULL, even though