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

Side by Side Diff: ui/gfx/canvas_android.cc

Issue 16051006: ui/gfx: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/canvas.cc ('k') | ui/gfx/canvas_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/canvas.h" 5 #include "ui/gfx/canvas.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/gfx/font.h" 8 #include "ui/gfx/font.h"
9 9
10 namespace gfx { 10 namespace gfx {
11 11
12 // static 12 // static
13 void Canvas::SizeStringInt(const string16& text, 13 void Canvas::SizeStringInt(const base::string16& text,
14 const gfx::Font& font, 14 const gfx::Font& font,
15 int* width, 15 int* width,
16 int* height, 16 int* height,
17 int line_height, 17 int line_height,
18 int flags) { 18 int flags) {
19 NOTIMPLEMENTED(); 19 NOTIMPLEMENTED();
20 } 20 }
21 21
22 void Canvas::DrawStringWithShadows(const string16& text, 22 void Canvas::DrawStringWithShadows(const base::string16& text,
23 const gfx::Font& font, 23 const gfx::Font& font,
24 SkColor color, 24 SkColor color,
25 const gfx::Rect& text_bounds, 25 const gfx::Rect& text_bounds,
26 int line_height, 26 int line_height,
27 int flags, 27 int flags,
28 const ShadowValues& shadows) { 28 const ShadowValues& shadows) {
29 NOTIMPLEMENTED(); 29 NOTIMPLEMENTED();
30 } 30 }
31 31
32 } // namespace gfx 32 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/canvas.cc ('k') | ui/gfx/canvas_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698