Browser Plugin: Simplify NewWindow code

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 304 matching lines @@
       break;
   }
 }
 
 void BrowserPluginGuest::AddNewContents(WebContents* source,
                                         WebContents* new_contents,
                                         WindowOpenDisposition disposition,
                                         const gfx::Rect& initial_pos,
                                         bool user_gesture,
                                         bool* was_blocked) {
-  *was_blocked = false;
+  if (was_blocked)

[Charlie Reis, 2013/04/04 21:48:46]

Any reason, or just to be clean?

[Fady Samuel, 2013/04/04 22:35:15]

Yes, this gets called from WebContentsImpl::ShowCreatedWindow now. There,
was_blocked is NULL.

+    *was_blocked = false;
   RequestNewWindowPermission(static_cast<WebContentsImpl*>(new_contents),
                              disposition, initial_pos, user_gesture);
 }
 
 void BrowserPluginGuest::CanDownload(
     RenderViewHost* render_view_host,
     int request_id,
     const std::string& request_method,
     const base::Callback<void(bool)>& callback) {
   if (download_request_callback_map_.size() >=
@@ skipping 355 matching lines @@
     IPC_MESSAGE_HANDLER(ViewHostMsg_HasTouchEventHandlers,
                         OnHasTouchEventHandlers)
     IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnLockMouse)
     IPC_MESSAGE_HANDLER(ViewHostMsg_SetCursor, OnSetCursor)
  #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_ShowView, OnShowView)
     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];
   if (!GetWebContents()->opener()) {
     // For guests that have a suppressed opener, we navigate now.
     // Navigation triggers the creation of a RenderWidgetHostViewGuest so
     // we don't need to create one manually.
     params.src = target_url;
   } else {
     // Ensure that the newly attached guest gets a RenderWidgetHostViewGuest.
     WebContentsViewGuest* new_view =
         static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
     new_view->CreateViewForWidget(web_contents()->GetRenderViewHost());
-
-    // Reply to ViewHostMsg_ShowView to inform the renderer that the browser has
-    // processed the move.  The browser may have ignored the move, but it
-    // finished processing.  This is used because the renderer keeps a temporary
-    // cache of the widget position while these asynchronous operations are in
-    // progress.
-    Send(new ViewMsg_Move_ACK(web_contents()->GetRoutingID()));
   }
   // Once a new guest is attached to the DOM of the embedder page, then the
   // lifetime of the new guest is no longer managed by the opener guest.
   opener()->pending_new_windows_.erase(this);
 
   // The guest's frame name takes precedence over the BrowserPlugin's name.
   // The guest's frame name is assigned in
   // BrowserPluginGuest::WebContentsCreated.
   if (!name_.empty())
     params.name.clear();
@@ skipping 333 matching lines @@
   popup_menu_helper.ShowPopupMenu(translated_bounds,
                                   params.item_height,
                                   params.item_font_size,
                                   params.selected_item,
                                   params.popup_items,
                                   params.right_aligned,
                                   params.allow_multiple_selection);
 }
 #endif
 
-void BrowserPluginGuest::OnShowView(int route_id,
-                                    WindowOpenDisposition disposition,
-                                    const  gfx::Rect& initial_bounds,
-                                    bool user_gesture) {
-  RenderViewHostImpl* rvh = RenderViewHostImpl::FromID(
-      web_contents()->GetRenderProcessHost()->GetID(), route_id);
-  WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
-      WebContents::FromRenderViewHost(rvh));
-  RequestNewWindowPermission(

[Charlie Reis, 2013/04/04 21:48:46]

How does this work now?

[Fady Samuel, 2013/04/04 22:35:15]

BrowserPluginGuest::AddNewContents handles both cases whether or not the opener
is suppressed.

-      web_contents, disposition, initial_bounds, user_gesture);
-}
-
 void BrowserPluginGuest::OnShowWidget(int route_id,
                                       const gfx::Rect& initial_pos) {
   gfx::Rect screen_pos(initial_pos);
   screen_pos.Offset(guest_screen_rect_.OffsetFromOrigin());
   GetWebContents()->ShowCreatedWidget(route_id, screen_pos);
 }
 
 void BrowserPluginGuest::OnTakeFocus(bool reverse) {
   SendMessageToEmbedder(
       new BrowserPluginMsg_AdvanceFocus(instance_id(), reverse));
@@ skipping 208 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