diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 03:35:56 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 03:35:56 +0000 |
| commit | 09b21196f2668fb0dc2ebc630add31ac4c3ea956 (patch) | |
| tree | 15a8c854bde4e516c5f02f0556dcf6fa67bbc7b8 /chrome/browser/icon_loader_win.cc | |
| parent | 7bd7f0f2255048cc45e1297e499f19220d5d8745 (diff) | |
| download | chromium_src-09b21196f2668fb0dc2ebc630add31ac4c3ea956.zip chromium_src-09b21196f2668fb0dc2ebc630add31ac4c3ea956.tar.gz chromium_src-09b21196f2668fb0dc2ebc630add31ac4c3ea956.tar.bz2 | |
Revert 137068 - 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
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10382166
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137072 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, 2 insertions, 4 deletions
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc index c217bff..f51c064 100644 --- a/chrome/browser/icon_loader_win.cc +++ b/chrome/browser/icon_loader_win.cc @@ -10,7 +10,6 @@ #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" @@ -35,9 +34,8 @@ void IconLoader::ReadIcon() { SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES)) return; - scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON( - file_info.hIcon)); - image_.reset(new gfx::Image(*bitmap)); + image_.reset(new gfx::Image( + IconUtil::CreateSkBitmapFromHICON(file_info.hIcon))); DestroyIcon(file_info.hIcon); target_message_loop_->PostTask(FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); |