From 8cc8d4914c363a3308fdbae1415e2a3fbbce8e9e Mon Sep 17 00:00:00 2001
From: "pkasting@chromium.org"
 <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 2 Feb 2010 10:40:49 +0000
Subject: Wire popup blocking UI to the new machinery and port over the user's
 old whitelist.

Notably, this removes the UI entirely for Mac and Linux.  We need to rebuild it.

This also guts the old system's testing, since most of it disappeared or changed radically.  We should test the new stuff.  I will file a followup bug for that.

There are various tiny edge cases, like if you click the address bar icon really quickly, sometimes you'll get popups without any title yet, which makes them leave gaps in the bubble that appears.  We can fix that sort of thing.  The critical bit I tried to ensure was that we never try to open a dead popup or use a dead TabContents, no matter what.

BUG=33314
TEST=Go visit some sites with popups and play with things
Review URL: http://codereview.chromium.org/562013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37819 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/generated_resources.grd | 30 ------------------------------
 1 file changed, 30 deletions(-)

(limited to 'chrome/app/generated_resources.grd')

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 62490f5..f86d5e3 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5983,36 +5983,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Continue
       </message>
 
-      <!-- Constrained Window -->
-      <message name="IDS_BLOCKED_POPUP" desc="Text on a blocked popup's window titlebar.">
-        Blocked Pop-up
-      </message>
-      <message name="IDS_POPUPS_BLOCKED_COUNT" desc="Message on the blocked popup window when there are blocked popups">
-        Pop-ups Blocked: <ph name="COUNT">$1<ex>2</ex></ph>
-      </message>
-      <message name="IDS_POPUPS_UNBLOCKED" desc="Message on the blocked popup window when there are only whitelisted popups">
-        Manage pop-ups
-      </message>
-      <message name="IDS_POPUP_TITLE_FORMAT" desc="Order of URL - Title on the popup">
-        <ph name="URL">$1</ph> - <ph name="WINDOW_TITLE">$2</ph>
-      </message>
-      <message name="IDS_NOTICE_TITLE_FORMAT" desc="Order of URL - Reason">
-        <ph name="URL">$1</ph> - <ph name="REASON">$2</ph>
-      </message>
-      <if expr="not pp_ifdef('use_titlecase')">
-        <message name="IDS_POPUP_HOST_FORMAT" desc="Checkable menu item to always allow popups from a particular hostname">
-          Always show pop-ups from <ph name="URL">$1</ph>
-        </message>
-      </if>
-      <if expr="pp_ifdef('use_titlecase')">
-        <message name="IDS_POPUP_HOST_FORMAT" desc="In Title Case: Checkable menu item to always allow popups from a particular hostname">
-          Always Show Pop-ups From <ph name="URL">$1</ph>
-        </message>
-      </if>
-      <message name="IDS_BLOCKED_NOTICE_COUNT" desc="Message shown in the corner of the content window when there are blocked items.">
-        Blocked Items: <ph name="COUNT">$1<ex>2</ex></ph>
-      </message>
-
       <!-- Multiple download warning-->
       <message name="IDS_MULTI_DOWNLOAD_WARNING" desc="Warning invoked if multiple downloads are attempted without user interaction.">
         This site is attempting to download multiple files. Do you want to allow this?
-- 
cgit v1.1