diff options
author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 15:31:06 +0000 |
---|---|---|
committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 15:31:06 +0000 |
commit | df0c36a8a724fa9c9c839fe2116fa448913bd458 (patch) | |
tree | dacae210175018a10487c6b4d665615d60f7d571 /chrome/browser/cocoa/download_item_controller.mm | |
parent | 351e823dc7bab899d9f1293c2e657346fd39d3d6 (diff) | |
download | chromium_src-df0c36a8a724fa9c9c839fe2116fa448913bd458.zip chromium_src-df0c36a8a724fa9c9c839fe2116fa448913bd458.tar.gz chromium_src-df0c36a8a724fa9c9c839fe2116fa448913bd458.tar.bz2 |
Use more images from the pak files
- Remove the alert icon from the download item dangerous download xib.
- Remove the download fav icon from the download shelf xib.
- Update the download shelf to fetch the image from the pak.
- Update the download item to fetch the alert image from the pak.
- Update the bookmark bar to fetch the folder icon from the xib and cache it.
- Remove the three images from the bundles.
BUG=20230
TEST=all three still show their images
Review URL: http://codereview.chromium.org/260012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/download_item_controller.mm')
-rw-r--r-- | chrome/browser/cocoa/download_item_controller.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/download_item_controller.mm b/chrome/browser/cocoa/download_item_controller.mm index dbd42e0..dcb0116 100644 --- a/chrome/browser/cocoa/download_item_controller.mm +++ b/chrome/browser/cocoa/download_item_controller.mm @@ -6,6 +6,7 @@ #include "app/gfx/text_elider.h" #include "app/l10n_util_mac.h" +#include "app/resource_bundle.h" #include "base/mac_util.h" #include "base/sys_string_conversions.h" #import "chrome/browser/cocoa/download_item_cell.h" @@ -15,6 +16,7 @@ #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/download/download_util.h" #include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" static const int kTextWidth = 140; // Pixels @@ -103,6 +105,11 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu { frameOrigin.x += widthChange; [buttonTweaker_ setFrameOrigin:frameOrigin]; + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + NSImage* alertIcon = rb.GetNSImageNamed(IDR_WARNING); + DCHECK(alertIcon); + [image_ setImage:alertIcon]; + [self setStateFromDownload:bridge_->download_model()]; bridge_->LoadIcon(); } |