Browser Plugin: browser process side changes

content/browser/renderer_host/render_view_host_impl.cc

Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 9213d8979f92a43d230fab11d8546cdd4cdbd1de..de543cc3ed0e65187a6a20c5327f25bd951bab5b 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -30,6 +30,7 @@
 #include "content/browser/power_save_blocker.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/common/accessibility_messages.h"
+#include "content/common/browser_plugin_messages.h"
 #include "content/common/desktop_notification_messages.h"
 #include "content/common/drag_messages.h"
 #include "content/common/inter_process_time_ticks_converter.h"
@@ -105,7 +106,7 @@ namespace content {
 
 // static
 RenderViewHost* RenderViewHost::FromID(int render_process_id,
-                                       int render_view_id) {
+                                      int render_view_id) {
   RenderProcessHost* process = RenderProcessHost::FromID(render_process_id);
   if (!process)
     return NULL;
@@ -125,7 +126,7 @@ RenderViewHost* RenderViewHost::From(RenderWidgetHost* rwh) {
 
 // static
 RenderViewHostImpl* RenderViewHostImpl::FromID(int render_process_id,
-                                               int render_view_id) {
+                                              int render_view_id) {

[Charlie Reis, 2012/05/18 20:35:24]

Wrong indent.

[Fady Samuel, 2012/05/21 14:30:17]

Done.

   return static_cast<RenderViewHostImpl*>(
       RenderViewHost::FromID(render_process_id, render_view_id));
 }
@@ -257,9 +258,10 @@ bool RenderViewHostImpl::CreateRenderView(const string16& frame_name,
           gfx::NativeViewFromId(GetNativeViewId()));
 #endif
 
-  if (embedder_process_id != -1)
+  if (embedder_process_id != -1) {
     params.embedder_channel_name =
         StringPrintf("%d.r%d", GetProcess()->GetID(), embedder_process_id);
+  }
 
   params.accessibility_mode =
       BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser() ?
@@ -913,6 +915,9 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) {
                         OnDomOperationResponse)
     IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Notifications,
                         OnAccessibilityNotifications)
+    IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_ResizeGuest, OnResizeGuest)
+    IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_NavigateFromEmbedder,
+                        OnNavigateGuestFromEmbedder)
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(
         handled = RenderWidgetHostImpl::OnMessageReceived(msg))
@@ -1820,6 +1825,24 @@ void RenderViewHostImpl::OnDomOperationResponse(
       content::Details<DomOperationNotificationDetails>(&details));
 }
 
+void RenderViewHostImpl::OnResizeGuest(int width, int height) {
+  DCHECK(GetView());
+  GetView()->SetSize(gfx::Size(width, height));
+}
+
+void RenderViewHostImpl::OnNavigateGuestFromEmbedder(int32 instance_id,
+                                                     long long frame_id,
+                                                     const std::string& src,
+                                                     const gfx::Size& size) {
+

[Charlie Reis, 2012/05/18 20:35:24]

Remove blank line.

[Fady Samuel, 2012/05/21 14:30:17]

Done.

+  delegate_->NavigateGuestFromEmbedder(
+      this,
+      instance_id,
+      frame_id,
+      src,
+      size);
+}
+
 void RenderViewHostImpl::SetSwappedOut(bool is_swapped_out) {
   is_swapped_out_ = is_swapped_out;