3 files changed, 41 insertions, 3 deletions

diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h
index 74de33f..b195f5c 100644
--- a/chrome/common/plugin_messages.h
+++ b/chrome/common/plugin_messages.h
@@ -39,6 +39,11 @@ struct PluginMsg_Init_Params {
   std::vector<std::string> arg_values;
   bool load_manually;
   int host_render_view_routing_id;
+#if defined(OS_MACOSX)
+  gfx::Rect containing_window_frame;
+  gfx::Rect containing_content_frame;
+  bool containing_window_has_focus;
+#endif
 };
 
 struct PluginHostMsg_URLRequest_Params {
@@ -119,6 +124,11 @@ struct ParamTraits<PluginMsg_Init_Params> {
     WriteParam(m, p.arg_values);
     WriteParam(m, p.load_manually);
     WriteParam(m, p.host_render_view_routing_id);
+#if defined(OS_MACOSX)
+    WriteParam(m, p.containing_window_frame);
+    WriteParam(m, p.containing_content_frame);
+    WriteParam(m, p.containing_window_has_focus);
+#endif
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return ReadParam(m, iter, &p->containing_window) &&
@@ -127,7 +137,14 @@ struct ParamTraits<PluginMsg_Init_Params> {
            ReadParam(m, iter, &p->arg_names) &&
            ReadParam(m, iter, &p->arg_values) &&
            ReadParam(m, iter, &p->load_manually) &&
-           ReadParam(m, iter, &p->host_render_view_routing_id);
+           ReadParam(m, iter, &p->host_render_view_routing_id)
+#if defined(OS_MACOSX)
+           &&
+           ReadParam(m, iter, &p->containing_window_frame) &&
+           ReadParam(m, iter, &p->containing_content_frame) &&
+           ReadParam(m, iter, &p->containing_window_has_focus)
+#endif
+           ;
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"(");
@@ -144,6 +161,14 @@ struct ParamTraits<PluginMsg_Init_Params> {
     LogParam(p.load_manually, l);
     l->append(L", ");
     LogParam(p.host_render_view_routing_id, l);
+#if defined(OS_MACOSX)
+    l->append(L", ");
+    LogParam(p.containing_window_frame, l);
+    l->append(L", ");
+    LogParam(p.containing_content_frame, l);
+    l->append(L", ");
+    LogParam(p.containing_window_has_focus, l);
+#endif
     l->append(L")");
   }
 };
diff --git a/chrome/common/plugin_messages_internal.h b/chrome/common/plugin_messages_internal.h
index 05e532b..b5908a8 100644
--- a/chrome/common/plugin_messages_internal.h
+++ b/chrome/common/plugin_messages_internal.h
@@ -233,8 +233,16 @@ IPC_BEGIN_MESSAGES(Plugin)
   IPC_MESSAGE_ROUTED1(PluginMsg_SetWindowFocus,
                       bool /* has_focus */)
 
-  IPC_MESSAGE_ROUTED1(PluginMsg_SetContainerVisibility,
-                      bool /* is_visible */)
+  IPC_MESSAGE_ROUTED0(PluginMsg_ContainerHidden)
+
+  IPC_MESSAGE_ROUTED3(PluginMsg_ContainerShown,
+                      gfx::Rect /* window_frame */,
+                      gfx::Rect /* view_frame */,
+                      bool /* has_focus */)
+
+  IPC_MESSAGE_ROUTED2(PluginMsg_WindowFrameChanged,
+                      gfx::Rect /* window_frame */,
+                      gfx::Rect /* view_frame */)
 #endif
 
   IPC_SYNC_MESSAGE_ROUTED2_0(PluginMsg_WillSendRequest,
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index bd23f31..69d7bb2 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -745,6 +745,11 @@ IPC_BEGIN_MESSAGES(View)
   // Let the RenderView know its window has changed visibility.
   IPC_MESSAGE_ROUTED1(ViewMsg_SetWindowVisibility,
                       bool /* visibile */)
+
+  // Let the RenderView know its window's frame has changed.
+  IPC_MESSAGE_ROUTED2(ViewMsg_WindowFrameChanged,
+                      gfx::Rect /* window frame */,
+                      gfx::Rect /* content view frame */)
 #endif
 
   // Response message to ViewHostMsg_CreateShared/DedicatedWorker.