diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 17:59:47 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 17:59:47 +0000 |
| commit | 6f01e95e2c326c01f573968b136781e87e62067a (patch) | |
| tree | 4991623f5221c97147992f60a10b2147d230aebc /chrome/browser/autofill | |
| parent | e4359be2f8068dce74234add3fb5268bbc90670f (diff) | |
| download | chromium_src-6f01e95e2c326c01f573968b136781e87e62067a.zip chromium_src-6f01e95e2c326c01f573968b136781e87e62067a.tar.gz chromium_src-6f01e95e2c326c01f573968b136781e87e62067a.tar.bz2 | |
Integrate gfx::Image into the ResourceBundle.
This changes the definition of GetNativeImageNamed to return a gfx::Image and
adds GetImageNamed in addition. GetBitmapNamed now goes through that method. On
Linux, GetNativeImageNamed will load directly into a GdkPixbuf-backed Image. Mac
will still first load through Skia (a future CL will load directly into an
NSImage). All other platforms use Skia natively, so GetNativeImageNamed is the
same as GetImageNamed.
Mac was the only platform that used the old GetNativeImageNamed, so this also
transitions a bunch of Mac files by including ui/gfx/image.h.
This also obviates the need for platform-specific image caches in the
ResourceBundle, so there's some additional cleanup around that.
BUG=carnitas
TEST=All UI images in Chromium show up as before.
Review URL: http://codereview.chromium.org/6541031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill')
| -rw-r--r-- | chrome/browser/autofill/autofill_dialog_controller_mac.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.mm b/chrome/browser/autofill/autofill_dialog_controller_mac.mm index b046704..74f4249 100644 --- a/chrome/browser/autofill/autofill_dialog_controller_mac.mm +++ b/chrome/browser/autofill/autofill_dialog_controller_mac.mm @@ -26,6 +26,7 @@ #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/image.h" namespace { |