diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 10:40:49 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 10:40:49 +0000 |
commit | 8cc8d4914c363a3308fdbae1415e2a3fbbce8e9e (patch) | |
tree | f2b38543aa09fd9945341376bfca465b7efbbf92 /chrome/app/chrome_dll_resource.h | |
parent | 458788376076d57d182ca22060b335d2e5f2e18f (diff) | |
download | chromium_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_resource.h')
-rw-r--r-- | chrome/app/chrome_dll_resource.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index 5302f1f..423c053 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h @@ -118,11 +118,10 @@ #define IDC_BOOKMARK_PAGE 35000 #define IDC_BOOKMARK_ALL_TABS 35001 #define IDC_VIEW_SOURCE 35002 -#define IDC_CLOSE_POPUPS 35003 -#define IDC_PRINT 35004 -#define IDC_SAVE_PAGE 35005 -#define IDC_ENCODING_MENU 35006 -#define IDC_EMAIL_PAGE_LOCATION 35007 +#define IDC_PRINT 35003 +#define IDC_SAVE_PAGE 35004 +#define IDC_ENCODING_MENU 35005 +#define IDC_EMAIL_PAGE_LOCATION 35006 // When adding a new encoding to this list, be sure to append it to the // EncodingMenuController::kValidEncodingIds array in |