Kill WebViewDelegate::WasOpenedByUserGesture, and instead have...

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1714 matching lines @@
 // created RenderView (i.e., as a constrained popup or as a new tab).
 //
 void RenderView::show(WebNavigationPolicy policy) {
   DCHECK(!did_show_) << "received extraneous Show call";
   DCHECK(opener_id_ != MSG_ROUTING_NONE);
 
   if (did_show_)
     return;
   did_show_ = true;
 
+  // Force new windows to a popup if they were not opened with a user gesture.
+  if (!opened_by_user_gesture_) {
+    // We exempt background tabs for compat with older versions of Chrome.
+    // TODO(darin): This seems bogus.  These should have a user gesture, so
+    // we probably don't need this check.
+    if (policy != WebKit::WebNavigationPolicyNewBackgroundTab)
+      policy = WebKit::WebNavigationPolicyNewPopup;
+  }
+
   // NOTE: initial_pos_ may still have its default values at this point, but
   // that's okay.  It'll be ignored if disposition is not NEW_POPUP, or the
   // browser process will impose a default position otherwise.
   Send(new ViewHostMsg_ShowView(opener_id_, routing_id_,
       NavigationPolicyToDisposition(policy), initial_pos_,
       opened_by_user_gesture_, creator_url_));
   SetPendingWindowRect(initial_pos_);
 }
 
 void RenderView::closeWidgetSoon() {
@@ skipping 1012 matching lines @@
     Send(new ViewMsg_DeterminePageText_Reply(routing_id_, contents));
     determine_page_text_after_loading_stops_ = false;
     return;
   }
 
   // We set |determine_page_text_after_loading_stops_| true here so that,
   // after page has been loaded completely, the text in the page is captured.
   determine_page_text_after_loading_stops_ = true;
 }
 
-bool RenderView::WasOpenedByUserGesture() const {
-  return opened_by_user_gesture_;
-}
-
 void RenderView::DnsPrefetch(const std::vector<std::string>& host_names) {
   Send(new ViewHostMsg_DnsPrefetch(host_names));
 }
 
 void RenderView::OnZoom(int function) {
   static const bool kZoomIsTextOnly = false;
   switch (function) {
     case PageZoom::SMALLER:
       webview()->zoomOut(kZoomIsTextOnly);
       break;
@@ skipping 867 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }