Various popup UI fixes:

* Remove "show popup notification" option, pref, and all associated machinery.
* Toggling whitelisting on for a site no longer hides the "manage" button.
* Toggling whitelisting off for a site re-blocks (not closes) its popups, and does not hide the "manage" button.

Also rips the whitelist hooks out of TabContents in preparation for getting the whitelist values directly from the BlockedPopupContainer, since there was no reason to plumb everything through TabContents.

BUG=11440
Review URL: http://codereview.chromium.org/115112

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15670 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 4 deletions

diff --git a/chrome/browser/download/download_request_manager.cc b/chrome/browser/download/download_request_manager.cc
index 4cd4319..4364700 100644
--- a/chrome/browser/download/download_request_manager.cc
+++ b/chrome/browser/download/download_request_manager.cc
@@ -241,11 +241,10 @@ void DownloadRequestManager::CanDownload(int render_process_host_id,
 void DownloadRequestManager::CanDownloadImpl(
     TabContents* originating_tab,
     Callback* callback) {
+  // If the tab requesting the download is a constrained popup that is not
+  // shown, treat the request as if it came from the parent.
   TabContents* effective_tab = originating_tab;
-  if (effective_tab->delegate() &&
-      effective_tab->delegate()->GetConstrainingContents(effective_tab)) {
-    // The tab requesting the download is a constrained popup that is not
-    // shown, treat the request as if it came from the parent.
+  if (effective_tab->delegate()) {
     effective_tab =
         effective_tab->delegate()->GetConstrainingContents(effective_tab);
   }