summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll.rc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 10:40:49 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 10:40:49 +0000
commit8cc8d4914c363a3308fdbae1415e2a3fbbce8e9e (patch)
treef2b38543aa09fd9945341376bfca465b7efbbf92 /chrome/app/chrome_dll.rc
parent458788376076d57d182ca22060b335d2e5f2e18f (diff)
downloadchromium_src-8cc8d4914c363a3308fdbae1415e2a3fbbce8e9e.zip
chromium_src-8cc8d4914c363a3308fdbae1415e2a3fbbce8e9e.tar.gz
chromium_src-8cc8d4914c363a3308fdbae1415e2a3fbbce8e9e.tar.bz2
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
Diffstat (limited to 'chrome/app/chrome_dll.rc')
-rw-r--r--chrome/app/chrome_dll.rc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index 57c2f50..6320f22 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -39,7 +39,6 @@ BEGIN
VK_DELETE, IDC_CLEAR_BROWSING_DATA, VIRTKEY, CONTROL, SHIFT
VK_F4, IDC_CLOSE_TAB, VIRTKEY, CONTROL
"W", IDC_CLOSE_TAB, VIRTKEY, CONTROL
- "W", IDC_CLOSE_POPUPS, VIRTKEY, SHIFT, ALT
"W", IDC_CLOSE_WINDOW, VIRTKEY, CONTROL, SHIFT
"F", IDC_FIND, VIRTKEY, CONTROL
"G", IDC_FIND_NEXT, VIRTKEY, CONTROL