diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 03:28:29 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 03:28:29 +0000 |
| commit | 12c7da12c76dfdd58e9a5fc2ed77b319dfd2c96d (patch) | |
| tree | c8b03dacda19d343c7dfc33ad72e4c273f808462 /chrome/browser/icon_loader_win.cc | |
| parent | e7a8cbd4d4d389e666d5d3c372bb5d09a63b829b (diff) | |
| download | chromium_src-12c7da12c76dfdd58e9a5fc2ed77b319dfd2c96d.zip chromium_src-12c7da12c76dfdd58e9a5fc2ed77b319dfd2c96d.tar.gz chromium_src-12c7da12c76dfdd58e9a5fc2ed77b319dfd2c96d.tar.bz2 | |
Revert 136812 - Get rid of Image::Image(SkBitmap*)
Bug=124566
Test=Compiles on CrOS,Mac
Review URL: https://chromiumcodereview.appspot.com/10378009
TBR=pkotwicz@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136813
Review URL: https://chromiumcodereview.appspot.com/10383153
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_loader_win.cc')
| -rw-r--r-- | chrome/browser/icon_loader_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc index f51c064..c217bff 100644 --- a/chrome/browser/icon_loader_win.cc +++ b/chrome/browser/icon_loader_win.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/threading/thread.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/icon_util.h" #include "ui/gfx/size.h" @@ -34,8 +35,9 @@ void IconLoader::ReadIcon() { SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES)) return; - image_.reset(new gfx::Image( - IconUtil::CreateSkBitmapFromHICON(file_info.hIcon))); + scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON( + file_info.hIcon)); + image_.reset(new gfx::Image(*bitmap)); DestroyIcon(file_info.hIcon); target_message_loop_->PostTask(FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); |