summaryrefslogtreecommitdiffstats
path: root/ash/shell/app_list.cc
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-02 15:56:30 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-02 15:56:30 +0000
commitf47d8ca1c22207d5d2d0d34724bcc41ae72bbc1a (patch)
tree51804fd4f5ae58849e8224350263392662a67439 /ash/shell/app_list.cc
parent5ba847593e0009ed9e40be8fc9adfc1ffda93310 (diff)
downloadchromium_src-f47d8ca1c22207d5d2d0d34724bcc41ae72bbc1a.zip
chromium_src-f47d8ca1c22207d5d2d0d34724bcc41ae72bbc1a.tar.gz
chromium_src-f47d8ca1c22207d5d2d0d34724bcc41ae72bbc1a.tar.bz2
setConfig is deprecated, use setInfo or allocPixels instead.
kPNColor_SkColorType is now kN32_SkColorType TBR= BUG=skia:2706 Review URL: https://codereview.chromium.org/363933002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/app_list.cc')
-rw-r--r--ash/shell/app_list.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index e396848..f835153 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -67,8 +67,7 @@ class WindowTypeShelfItem : public app_list::AppListItem {
const int kIconSize = 128;
SkBitmap icon;
- icon.setConfig(SkBitmap::kARGB_8888_Config, kIconSize, kIconSize);
- icon.allocPixels();
+ icon.allocN32Pixels(kIconSize, kIconSize);
icon.eraseColor(kColors[static_cast<int>(type) % arraysize(kColors)]);
return gfx::ImageSkia::CreateFrom1xBitmap(icon);
}