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

Unified Diff: chrome/browser/chromeos/login/username_view.cc

Issue 9705063: ui/gfx: Rename almost all entries from gfx::CanvasSkia to gfx::Canvas. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | « build/common.gypi ('k') | 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: chrome/browser/chromeos/login/username_view.cc
diff --git a/chrome/browser/chromeos/login/username_view.cc b/chrome/browser/chromeos/login/username_view.cc
index 90b6e042500c9fb12e460e9a19e050496e6c9189..ae9379a13e0c86a119f44e3ca86507b87d97fcd1 100644
--- a/chrome/browser/chromeos/login/username_view.cc
+++ b/chrome/browser/chromeos/login/username_view.cc
@@ -59,18 +59,16 @@ gfx::NativeCursor UsernameView::GetCursor(const views::MouseEvent& event) {
void UsernameView::PaintUsername(const gfx::Rect& bounds) {
margin_width_ = bounds.height() * kMarginRatio;
- gfx::CanvasSkia canvas(bounds.size(), false);
+ gfx::Canvas canvas(bounds.size(), false);
// Draw transparent background.
canvas.sk_canvas()->drawColor(0);
// Calculate needed space.
- int flags = gfx::Canvas::TEXT_ALIGN_LEFT |
- gfx::Canvas::TEXT_VALIGN_MIDDLE |
- gfx::Canvas::NO_ELLIPSIS;
+ int flags = gfx::Canvas::TEXT_ALIGN_LEFT | gfx::Canvas::TEXT_VALIGN_MIDDLE |
+ gfx::Canvas::NO_ELLIPSIS;
int text_height, text_width;
- gfx::CanvasSkia::SizeStringInt(GetText(), font(),
- &text_width, &text_height,
- flags);
+ gfx::Canvas::SizeStringInt(GetText(), font(), &text_width, &text_height,
+ flags);
text_width += margin_width_;
// Also leave the right margin.
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/chromeos/status/network_menu_icon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698