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

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2006-2008 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/browser/tab_contents/tab_contents.h"
 
 #include "base/file_version_info.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/time.h"
@@ skipping 17 matching lines @@
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/plugin_installer.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/url_constants.h"
 //#include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/mime_util.h"
@@ skipping 731 matching lines @@
 #endif
 
 void TabContents::AddNewContents(TabContents* new_contents,
                                  WindowOpenDisposition disposition,
                                  const gfx::Rect& initial_pos,
                                  bool user_gesture) {
   if (!delegate_)
     return;
 
 #if defined(OS_WIN)
-  if ((disposition == NEW_POPUP) && !user_gesture) {
+  if ((disposition == NEW_POPUP) && !user_gesture &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisablePopupBlocking)) {
     // Unrequested popups from normal pages are constrained.
     TabContents* popup_owner = this;
     TabContents* our_owner = delegate_->GetConstrainingContents(this);
     if (our_owner)
       popup_owner = our_owner;
     popup_owner->AddConstrainedPopup(new_contents, initial_pos);
   } else {
     new_contents->DisassociateFromPopupCount();
 
     delegate_->AddNewContents(this, new_contents, disposition, initial_pos,
@@ skipping 1639 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }