diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:55:08 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:55:08 +0000 |
| commit | 57047da61489644b8b3604dffd915a1ebcf78f91 (patch) | |
| tree | e15a0fae2a4eee1fe1e96b4d9df6d623175cbeaf /ash/shell/app_list.cc | |
| parent | a2a5801c6c7eeb9b5d7a7068a6ff50a2dd51ebd8 (diff) | |
| download | chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.zip chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.tar.gz chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.tar.bz2 | |
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
Diffstat (limited to 'ash/shell/app_list.cc')
| -rw-r--r-- | ash/shell/app_list.cc | 5 |
1 files changed, 2 insertions, 3 deletions
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) { |