Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(559)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell/app_list.cc

Issue 10790128: Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/network_menu_icon.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/app_list.cc
===================================================================
--- ash/shell/app_list.cc (revision 147935)
+++ ash/shell/app_list.cc (working copy)
@@ -203,8 +203,7 @@
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 @@
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) {
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/network_menu_icon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698