Get the renderer closer to rendering something on linux.

* implement some stubbed functions
* comment out some unimplemented IPC calls
* hack a webcontents widget into BrowserWindow so that something displays

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

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

4 files changed, 18 insertions, 5 deletions

diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 8ec0f44..6724a7f 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -7,6 +7,8 @@
 #include "base/logging.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/browser_toolbar_view_gtk.h"
+#include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 
 namespace {
 
@@ -70,6 +72,16 @@ void BrowserWindowGtk::Init() {
 }
 
 void BrowserWindowGtk::Show() {
+  // TODO(estade): fix this block. As it stands, it is a temporary hack to get
+  // the browser displaying something.
+  if (content_area_ == NULL) {
+    WebContents* contents = (WebContents*)(browser_->GetTabContentsAt(0));
+    content_area_ = ((RenderWidgetHostViewGtk*)contents->
+        render_view_host()->view())->native_view();
+    gtk_container_add(GTK_CONTAINER(window_), content_area_);
+    contents->NavigateToPendingEntry(false);
+  }
+
   gtk_widget_show_all(GTK_WIDGET(window_));
 }
 
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h
index cbf8a1e3..231ceae 100644
--- a/chrome/browser/gtk/browser_window_gtk.h
+++ b/chrome/browser/gtk/browser_window_gtk.h
@@ -65,6 +65,7 @@ class BrowserWindowGtk : public BrowserWindow {
  protected:
   virtual void DestroyBrowser();
   GtkWindow* window_;
+  GtkWidget* content_area_;
 
   scoped_ptr<Browser> browser_;
 
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index e244c83..a84b582 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -648,9 +648,9 @@ bool RenderViewHost::CanTerminate() const {
 
 void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
   if (msg.is_sync() && !msg.is_caller_pumping_messages()) {
-    NOTREACHED() << "Can't send sync messages to UI thread without pumping " \
-        "messages in the renderer or else deadlocks can occur if the page" \
-        "has windowed plugins!";
+    NOTREACHED() << "Can't send sync messages to UI thread without pumping "
+        "messages in the renderer or else deadlocks can occur if the page"
+        "has windowed plugins! (message type " << msg.type() << ")";
     IPC::Message* reply = IPC::SyncMessage::GenerateReply(&msg);
     reply->set_reply_error();
     Send(reply);
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 6b4375d..deb7e2f 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -155,8 +155,8 @@ void RenderWidgetHostViewGtk::Hide() {
 }
 
 gfx::Rect RenderWidgetHostViewGtk::GetViewBounds() const {
-  NOTIMPLEMENTED();
-  return gfx::Rect();
+  return gfx::Rect(view_->allocation.x, view_->allocation.y,
+                   view_->allocation.width, view_->allocation.height);
 }
 
 void RenderWidgetHostViewGtk::UpdateCursor(const WebCursor& cursor) {