diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 23:00:19 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 23:00:19 +0000 |
| commit | 32e7a9b5af36ff4c9288defd8c58c21b6217871b (patch) | |
| tree | 15c65f28d8f67c265a5013fb5d09a8c1fb36df0f /ash/shell | |
| parent | 21f2e2d73211c9e155b8e33313c6d1a5b5a52add (diff) | |
| download | chromium_src-32e7a9b5af36ff4c9288defd8c58c21b6217871b.zip chromium_src-32e7a9b5af36ff4c9288defd8c58c21b6217871b.tar.gz chromium_src-32e7a9b5af36ff4c9288defd8c58c21b6217871b.tar.bz2 | |
Convert gfx::Image::Image(const SkBitmap&) and gfx::ImageSkia::ImageSkia(const SkBitmap&) to gfx::Image::CreateFrom1xBitmap(const SkBitmap&) and gfx::ImageSkia::CreateFrom1xBitmap(const SkBitmap&) respectively
Hopefully these changes will make the constructors / factory methods less confusing and prevent bugs as a result of confusion about what the constructors do.
Review URL: https://chromiumcodereview.appspot.com/11970013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/app_list.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index 268a472..daaa486 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -60,7 +60,7 @@ class WindowTypeLauncherItem : public app_list::AppListItemModel { icon.setConfig(SkBitmap::kARGB_8888_Config, kIconSize, kIconSize); icon.allocPixels(); icon.eraseColor(kColors[static_cast<int>(type) % arraysize(kColors)]); - return gfx::ImageSkia(icon); + return gfx::ImageSkia::CreateFrom1xBitmap(icon); } // The text below is not localized as this is an example code. |