summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-04 00:19:59 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-04 00:19:59 +0000
commit8b6384271101aa16e3764ba0c927426e7966ea91 (patch)
tree8402b201190fdd2cb1074de95dd1ab9b3c51fc4a /chrome/app
parent3dca25ec097f4fb340df49d38ca1ff85805603aa (diff)
downloadchromium_src-8b6384271101aa16e3764ba0c927426e7966ea91.zip
chromium_src-8b6384271101aa16e3764ba0c927426e7966ea91.tar.gz
chromium_src-8b6384271101aa16e3764ba0c927426e7966ea91.tar.bz2
Redo how we block popups. Rip out the old constrained popup window cruft (while leaving the HTTP authentication dialog support) and add a new type of constrained window which owns all blocked popups. Rip out dead unit tests.
Review URL: http://codereview.chromium.org/8782 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/app/theme/menu_droparrow.pngbin0 -> 2932 bytes
-rw-r--r--chrome/app/theme/theme_resources.h1
-rw-r--r--chrome/app/theme/theme_resources.rc1
4 files changed, 5 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 214da38..cad0bfb 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3165,6 +3165,9 @@ each locale. -->
<message name="IDS_POPUPS_BLOCKED_COUNT" desc="Message on the blocked popup window">
Pop-ups Blocked: <ph name="COUNT">$1<ex>2</ex></ph>
</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>
<!-- Multiple download warning-->
<message name="IDS_MULTI_DOWNLOAD_WARNING" desc="Warning invoked if multiple downloads are attempted without user interaction.">
diff --git a/chrome/app/theme/menu_droparrow.png b/chrome/app/theme/menu_droparrow.png
new file mode 100644
index 0000000..9cc81e0
--- /dev/null
+++ b/chrome/app/theme/menu_droparrow.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.h b/chrome/app/theme/theme_resources.h
index a4cba37..e46c444 100644
--- a/chrome/app/theme/theme_resources.h
+++ b/chrome/app/theme/theme_resources.h
@@ -314,3 +314,4 @@
#define IDR_PRODUCT_LOGO 9306
#define IDR_DISTRIBUTOR_LOGO 9307
#define IDR_DISTRIBUTOR_LOGO_LIGHT 9308
+#define IDR_MENU_DROPARROW 9309
diff --git a/chrome/app/theme/theme_resources.rc b/chrome/app/theme/theme_resources.rc
index 58c3e8b..abc8199 100644
--- a/chrome/app/theme/theme_resources.rc
+++ b/chrome/app/theme/theme_resources.rc
@@ -303,3 +303,4 @@ IDR_FIND_DLG_RIGHT_BB_BACKGROUND BINDATA "find_dlg_right_bb_bg.png"
IDR_FIND_DLG_MIDDLE_BB_BACKGROUND BINDATA "find_dlg_middle_bb_bg.png"
IDR_THROBBER_LIGHT BINDATA "throbber_light.png"
IDR_OTR_ICON_STANDALONE BINDATA "otr_icon_standalone.png"
+IDR_MENU_DROPARROW BINDATA "menu_droparrow.png"