From 57047da61489644b8b3604dffd915a1ebcf78f91 Mon Sep 17 00:00:00 2001 From: "acolwell@chromium.org" Date: Mon, 23 Jul 2012 20:55:08 +0000 Subject: Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed Reverting because composite_unittests were failing on Linux (aura) and Linux ChromeOS Tests bots. Bug=None Test=Compiles on Mac and CrOS R=oshima,sky TBR=sadrul,sail Review URL: https://chromiumcodereview.appspot.com/10701063 TBR=pkotwicz@chromium.org Review URL: https://chromiumcodereview.appspot.com/10790128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147936 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/shell/app_list.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ash/shell') diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index bf2e8b4..6d636d9 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -203,8 +203,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { const string16 icon_text = ASCIIToUTF16("ash"); const gfx::Size icon_size(32, 32); - gfx::Canvas canvas(icon_size, ui::SCALE_FACTOR_100P, - false /* is_opaque */); + gfx::Canvas canvas(icon_size, false /* is_opaque */); canvas.DrawStringInt(icon_text, gfx::Font(), SK_ColorBLACK, @@ -213,7 +212,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { gfx::Canvas::TEXT_VALIGN_MIDDLE | gfx::Canvas::NO_SUBPIXEL_RENDERING); - return gfx::ImageSkia(canvas.ExtractImageRep()); + return gfx::ImageSkia(canvas.ExtractImageSkiaRep()); } void DecorateSearchBox(app_list::SearchBoxModel* search_box_model) { -- cgit v1.1