Second attempt at cleaning up handling of --disable-popup-blocking. I didn't...

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 178 matching lines @@
       page_id_(-1),
       last_page_id_sent_to_browser_(-1),
       last_indexed_page_id_(-1),
       opened_by_user_gesture_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       first_default_plugin_(NULL),
       devtools_agent_(NULL),
       devtools_client_(NULL),
       history_back_list_count_(0),
       history_forward_list_count_(0),
-      disable_popup_blocking_(false),
       has_unload_listener_(false),
       decrement_shared_popup_at_destruction_(false),
       form_field_autofill_request_id_(0),
       popup_notification_visible_(false),
       delay_seconds_for_form_state_sync_(kDefaultDelaySecondsForFormStateSync) {
 }
 
 RenderView::~RenderView() {
   if (decrement_shared_popup_at_destruction_)
     shared_popup_counter_->data--;
@@ skipping 111 matching lines @@
   if (opener_id == MSG_ROUTING_NONE) {
     did_show_ = true;
     CompleteInit(parent_hwnd);
   }
 
   host_window_ = parent_hwnd;
   modal_dialog_event_.reset(modal_dialog_event);
 
   if (command_line.HasSwitch(switches::kDomAutomationController))
     enabled_bindings_ |= BindingsPolicy::DOM_AUTOMATION;
-  disable_popup_blocking_ =
-      command_line.HasSwitch(switches::kDisablePopupBlocking);
 
   debug_message_handler_ = new DebugMessageHandler(this);
   render_thread_->AddFilter(debug_message_handler_);
 
   audio_message_filter_ = new AudioMessageFilter(routing_id_);
   render_thread_->AddFilter(audio_message_filter_);
 }
 
 void RenderView::OnMessageReceived(const IPC::Message& message) {
   WebFrame* main_frame = webview() ? webview()->GetMainFrame() : NULL;
@@ skipping 1610 matching lines @@
   DCHECK(!did_show_) << "received extraneous Show call";
   DCHECK(opener_id_ != MSG_ROUTING_NONE);
 
   if (did_show_)
     return;
   did_show_ = true;
 
   // 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_, disposition, initial_pos_,
-      WasOpenedByUserGestureHelper()));
+  Send(new ViewHostMsg_ShowView(opener_id_, routing_id_, disposition,
+                                initial_pos_, WasOpenedByUserGesture(NULL)));
 }
 
 void RenderView::CloseWidgetSoon(WebWidget* webwidget) {
   if (popup_notification_visible_ == false)
     RenderWidget::CloseWidgetSoon(webwidget);
 }
 
 void RenderView::RunModal(WebWidget* webwidget) {
   DCHECK(did_show_) << "should already have shown the view";
 
@@ skipping 310 matching lines @@
   // Send the search result over to the browser process.
   Send(new ViewHostMsg_Find_Reply(routing_id_,
                                   request_id,
                                   -1,
                                   selection_rect,
                                   active_match_ordinal,
                                   false));
 }
 
 bool RenderView::WasOpenedByUserGesture(WebView* webview) const {
-  return WasOpenedByUserGestureHelper();
-}
-
-bool RenderView::WasOpenedByUserGestureHelper() const {
-  // If pop-up blocking has been disabled, then treat all new windows as if
-  // they were opened by a user gesture.  This will prevent them from being
-  // blocked.  This is a bit of a hack, there should be a more straightforward
-  // way to disable pop-up blocking.
-  if (disable_popup_blocking_)
-    return true;
-
   return opened_by_user_gesture_;
 }
 
 void RenderView::SpellCheck(const std::wstring& word, int& misspell_location,
                             int& misspell_length) {
   Send(new ViewHostMsg_SpellCheck(routing_id_, word, &misspell_location,
                                   &misspell_length));
 }
 
 void RenderView::SetInputMethodState(bool enabled) {
@@ skipping 682 matching lines @@
     }
   }
   UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinishDoc", start_to_finish_doc);
   UMA_HISTOGRAM_TIMES("Renderer.All.FinishDocToFinish", finish_doc_to_finish);
   UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinish", start_to_finish);
   if (start_to_first_layout.ToInternalValue() >= 0) {
     UMA_HISTOGRAM_TIMES(
       "Renderer.All.StartToFirstLayout", start_to_first_layout);
   }
 }