Browser Plugin: Expose frame name changes to the content API

content/browser/browser_plugin/browser_plugin_guest.cc

 // Copyright (c) 2012 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 "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 588 matching lines @@
   // Initiating a drag from inside a guest is currently not supported. So inject
   // some JS to disable it. http://crbug.com/161112
   const char script[] = "window.addEventListener('dragstart', function() { "
                         "  window.event.preventDefault(); "
                         "});";
   render_view_host->ExecuteJavascriptInWebFrame(string16(),
                                                 ASCIIToUTF16(script));
   SendMessageToEmbedder(new BrowserPluginMsg_LoadStop(instance_id()));
 }
 
+void BrowserPluginGuest::DidUpdateFrameName(int frame_id,
+                                            bool is_top_level,
+                                            const std::string& name,
+                                            RenderViewHost* render_view_host) {
+  if (!is_top_level)
+    return;
+
+  name_ = name;
+  SendMessageToEmbedder(new BrowserPluginMsg_UpdatedName(instance_id_, name));
+}
+
 void BrowserPluginGuest::RenderViewReady() {
   // TODO(fsamuel): Investigate whether it's possible to update state earlier
   // here (see http://crbug.com/158151).
   Send(new ViewMsg_SetFocus(routing_id(), focused_));
   UpdateVisibility();
   RenderViewHost* rvh = GetWebContents()->GetRenderViewHost();
   if (auto_size_enabled_)
     rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
   else
     rvh->DisableAutoResize(damage_view_size_);
 
-  Send(new ViewMsg_SetName(routing_id(), name_));
+  rvh->SetName(name_);

[jam, 2013/04/09 16:11:51]

is the intent that this file will move out content, why is why you're calling a
RVH method instead of sending the IPC directly?

it looks like the IPC is only sent by here. why not just make it get answered by
a browser plugin class in the renderer and have it call out to webkit directly?
i.e. you don't need to change content for this (once this code is outside)

 
   RenderWidgetHostImpl::From(rvh)->
       set_hung_renderer_delay_ms(guest_hang_timeout_);
 }
 
 void BrowserPluginGuest::RenderViewGone(base::TerminationStatus status) {
   int process_id = GetWebContents()->GetRenderProcessHost()->GetID();
   SendMessageToEmbedder(
       new BrowserPluginMsg_GuestGone(instance_id(), process_id, status));
   switch (status) {
@@ skipping 65 matching lines @@
  #if defined(OS_MACOSX)
     // MacOSX creates and populates platform-specific select drop-down menus
     // whereas other platforms merely create a popup window that the guest
     // renderer process paints inside.
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnShowPopup)
  #endif
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget)
     IPC_MESSAGE_HANDLER(ViewHostMsg_TakeFocus, OnTakeFocus)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnUnlockMouse)
     IPC_MESSAGE_HANDLER(DragHostMsg_UpdateDragCursor, OnUpdateDragCursor)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFrameName, OnUpdateFrameName)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateRect, OnUpdateRect)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserPluginGuest::Attach(
     WebContentsImpl* embedder_web_contents,
     BrowserPluginHostMsg_CreateGuest_Params params) {
   const std::string target_url = opener()->pending_new_windows_[this];
@@ skipping 218 matching lines @@
   if (focused_ == focused)
       return;
   focused_ = focused;
   Send(new ViewMsg_SetFocus(routing_id(), focused));
 }
 
 void BrowserPluginGuest::OnSetName(int instance_id, const std::string& name) {
   if (name == name_)
     return;
   name_ = name;
-  Send(new ViewMsg_SetName(routing_id(), name));
+  GetWebContents()->GetRenderViewHost()->SetName(name_);
 }
 
 void BrowserPluginGuest::OnSetSize(
     int instance_id,
     const BrowserPluginHostMsg_AutoSize_Params& auto_size_params,
     const BrowserPluginHostMsg_ResizeGuest_Params& resize_guest_params) {
   bool old_auto_size_enabled = auto_size_enabled_;
   gfx::Size old_max_size = max_auto_size_;
   gfx::Size old_min_size = min_auto_size_;
   auto_size_enabled_ = auto_size_params.enable;
@@ skipping 144 matching lines @@
   RenderViewHostImpl* embedder_render_view_host =
       static_cast<RenderViewHostImpl*>(
           embedder_web_contents_->GetRenderViewHost());
   CHECK(embedder_render_view_host);
   RenderViewHostDelegateView* view =
       embedder_render_view_host->GetDelegate()->GetDelegateView();
   if (view)
     view->UpdateDragCursor(operation);
 }
 
-void BrowserPluginGuest::OnUpdateFrameName(int frame_id,
-                                           bool is_top_level,
-                                           const std::string& name) {
-  if (!is_top_level)
-    return;
-
-  name_ = name;
-  SendMessageToEmbedder(new BrowserPluginMsg_UpdatedName(instance_id_, name));
-}
-
 void BrowserPluginGuest::RequestMediaAccessPermission(
     WebContents* web_contents,
     const MediaStreamRequest& request,
     const MediaResponseCallback& callback) {
   if (media_requests_map_.size() >= kNumMaxOutstandingPermissionRequests) {
     // Deny the media request.
     callback.Run(MediaStreamDevices());
     return;
   }
   int request_id = next_permission_request_id_++;
@@ skipping 174 matching lines @@
                    base::Value::CreateStringValue(request_method));
   request_info.Set(browser_plugin::kURL, base::Value::CreateStringValue(url));
 
   SendMessageToEmbedder(
       new BrowserPluginMsg_RequestPermission(instance_id(),
           BrowserPluginPermissionTypeDownload, permission_request_id,
           request_info));
 }
 
 }  // namespace content