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

3 files changed, 0 insertions, 35 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 5986fe9..0517ee3 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -39,8 +39,6 @@
 #include "chrome/common/child_process_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/common/pref_service.h"
 #include "chrome/common/process_watcher.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/result_codes.h"
@@ -131,11 +129,6 @@ BrowserRenderProcessHost::BrowserRenderProcessHost(Profile* profile)
             this, &BrowserRenderProcessHost::ClearTransportDIBCache)) {
   widget_helper_ = new RenderWidgetHelper();
 
-  PrefService* prefs = profile->GetPrefs();
-  prefs->AddPrefObserver(prefs::kBlockPopups, this);
-  widget_helper_->set_block_popups(
-      profile->GetPrefs()->GetBoolean(prefs::kBlockPopups));
-
   NotificationService::current()->AddObserver(this,
       NotificationType::USER_SCRIPTS_LOADED,
       NotificationService::AllSources());
@@ -173,8 +166,6 @@ BrowserRenderProcessHost::~BrowserRenderProcessHost() {
     ProcessWatcher::EnsureProcessTerminated(process_.handle());
   }
 
-  profile()->GetPrefs()->RemovePrefObserver(prefs::kBlockPopups, this);
-
   NotificationService::current()->RemoveObserver(this,
       NotificationType::USER_SCRIPTS_LOADED, NotificationService::AllSources());
 
@@ -779,17 +770,6 @@ void BrowserRenderProcessHost::Observe(NotificationType type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
   switch (type.value) {
-    case NotificationType::PREF_CHANGED: {
-      std::wstring* pref_name_in = Details<std::wstring>(details).ptr();
-      DCHECK(Source<PrefService>(source).ptr() == profile()->GetPrefs());
-      if (*pref_name_in == prefs::kBlockPopups) {
-        widget_helper_->set_block_popups(
-            profile()->GetPrefs()->GetBoolean(prefs::kBlockPopups));
-      } else {
-        NOTREACHED() << "unexpected pref change notification" << *pref_name_in;
-      }
-      break;
-    }
     case NotificationType::USER_SCRIPTS_LOADED: {
       base::SharedMemory* shared_memory =
           Details<base::SharedMemory>(details).ptr();
diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc
index d738a75..7105f8c 100644
--- a/chrome/browser/renderer_host/render_widget_helper.cc
+++ b/chrome/browser/renderer_host/render_widget_helper.cc
@@ -51,7 +51,6 @@ RenderWidgetHelper::RenderWidgetHelper()
 #elif defined(OS_POSIX)
       event_(false /* auto-reset */, false),
 #endif
-      block_popups_(false),
       resource_dispatcher_host_(NULL) {
 }
 
@@ -208,14 +207,6 @@ void RenderWidgetHelper::CreateNewWindow(int opener_id,
                                          base::ProcessHandle render_process,
                                          int* route_id,
                                          ModalDialogEvent* modal_dialog_event) {
-  if (!user_gesture && block_popups_) {
-    *route_id = MSG_ROUTING_NONE;
-#if defined(OS_WIN)
-    modal_dialog_event->event = NULL;
-#endif
-    return;
-  }
-
   *route_id = GetNextRoutingID();
 
   ModalDialogEvent modal_dialog_event_internal;
diff --git a/chrome/browser/renderer_host/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h
index 0e1641b..48f6087 100644
--- a/chrome/browser/renderer_host/render_widget_helper.h
+++ b/chrome/browser/renderer_host/render_widget_helper.h
@@ -95,9 +95,6 @@ class RenderWidgetHelper :
   // Gets the next available routing id.  This is thread safe.
   int GetNextRoutingID();
 
-  // Sets whether popup blocking is enabled or not.
-  void set_block_popups(bool block) { block_popups_ = block; }
-
 
   // UI THREAD ONLY -----------------------------------------------------------
 
@@ -197,9 +194,6 @@ class RenderWidgetHelper :
   // The next routing id to use.
   base::AtomicSequenceNumber next_routing_id_;
 
-  // Whether popup blocking is enabled or not.
-  bool block_popups_;
-
   ResourceDispatcherHost* resource_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);