diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 19:03:25 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 19:03:25 +0000 |
| commit | d6598c050acb33ef7a64d32b116a6f10ba941329 (patch) | |
| tree | 3e1e01c8a79b9e787f39fae834853b123d546276 /chrome/app | |
| parent | 49a608d55bdb77491ea5dfe605a924fd1cb88d63 (diff) | |
| download | chromium_src-d6598c050acb33ef7a64d32b116a6f10ba941329.zip chromium_src-d6598c050acb33ef7a64d32b116a6f10ba941329.tar.gz chromium_src-d6598c050acb33ef7a64d32b116a6f10ba941329.tar.bz2 | |
This is r4523, with a few changes to make things work under Vista.
- Explicitly set_delegate(NULL) before releasing a TabContents. (I think
the order messages are getting handled is different from XP; this only
seems neccessary under Vista.)
- r4523 and someone elses change added entries to theme_resources.rc at
roughly the same time, causing happy fun crashes.
- Roll in sgk's SConscript fix.
Review URL: http://codereview.chromium.org/9373
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/app/theme/menu_droparrow.png | bin | 0 -> 2932 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.h | 1 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources.rc | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e6efd99..c45bf67 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3172,6 +3172,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 Binary files differnew file mode 100644 index 0000000..9cc81e0 --- /dev/null +++ b/chrome/app/theme/menu_droparrow.png diff --git a/chrome/app/theme/theme_resources.h b/chrome/app/theme/theme_resources.h index 03b34f2..0dda934 100644 --- a/chrome/app/theme/theme_resources.h +++ b/chrome/app/theme/theme_resources.h @@ -316,3 +316,4 @@ #define IDR_DISTRIBUTOR_LOGO_LIGHT 9308 #define IDR_BOOKMARK_MANAGER_RECENT_ICON 9309 #define IDR_BOOKMARK_MANAGER_SEARCH_ICON 9310 +#define IDR_MENU_DROPARROW 9311 diff --git a/chrome/app/theme/theme_resources.rc b/chrome/app/theme/theme_resources.rc index 9826562..ab835ee 100644 --- a/chrome/app/theme/theme_resources.rc +++ b/chrome/app/theme/theme_resources.rc @@ -305,3 +305,4 @@ IDR_THROBBER_LIGHT BINDATA "throbber_light.png" IDR_OTR_ICON_STANDALONE BINDATA "otr_icon_standalone.png" IDR_BOOKMARK_MANAGER_RECENT_ICON BINDATA "bookmark_manager_recent.png" IDR_BOOKMARK_MANAGER_SEARCH_ICON BINDATA "bookmark_manager_search.png" +IDR_MENU_DROPARROW BINDATA "menu_droparrow.png" |
