diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 15:50:07 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 15:50:07 +0000 |
| commit | 66171abedad9f817901db48328fdc417ecf56c7a (patch) | |
| tree | 59ebd2a67731072f9326f08fa3fcce32cc1c5866 /views/drag_utils.h | |
| parent | 7aebaf878d8ec781f8fcc5f2932d67a9f6afb966 (diff) | |
| download | chromium_src-66171abedad9f817901db48328fdc417ecf56c7a.zip chromium_src-66171abedad9f817901db48328fdc417ecf56c7a.tar.gz chromium_src-66171abedad9f817901db48328fdc417ecf56c7a.tar.bz2 | |
Convert IconLoader and IconManager to deal with gfx::Image rather than SkBitmap.
This allows loading of icons in the platform format, avoiding unnecessary
conversions if the image is going to be used with the platform toolkit. In other
cases, this just pushes image conversion to the callsite rather than the actual
image load.
BUG=19685
TEST=unit_tests and visual inspection of icons in the download shelf
Review URL: http://codereview.chromium.org/6597043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/drag_utils.h')
| -rw-r--r-- | views/drag_utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/drag_utils.h b/views/drag_utils.h index 020e6bd..ad17ce9 100644 --- a/views/drag_utils.h +++ b/views/drag_utils.h @@ -38,7 +38,7 @@ void SetURLAndDragImage(const GURL& url, // the supplied data_object. 'file_name' can be a full path, but the directory // portion will be truncated in the drag image. void CreateDragImageForFile(const FilePath& file_name, - SkBitmap* icon, + const SkBitmap* icon, OSExchangeData* data_object); // Sets the drag image on data_object from the supplied canvas. width/height |