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

Unified Diff: ui/gfx/render_text.h

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/platform_font_win.cc ('k') | ui/gfx/render_text.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text.h
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index 3f2883192bc4e1d91778b3f19ffdafa20cf738fe..aaffdcddc80d4ea0f5abc5b4851c8cc87213383e 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -124,8 +124,8 @@ class UI_EXPORT RenderText {
// Creates a platform-specific RenderText instance.
static RenderText* CreateInstance();
- const string16& text() const { return text_; }
- void SetText(const string16& text);
+ const base::string16& text() const { return text_; }
+ void SetText(const base::string16& text);
HorizontalAlignment horizontal_alignment() const {
return horizontal_alignment_;
@@ -409,7 +409,7 @@ class UI_EXPORT RenderText {
virtual void DrawVisualText(Canvas* canvas) = 0;
// Returns the text used for layout, which may be |obscured_text_|.
- const string16& GetLayoutText() const;
+ const base::string16& GetLayoutText() const;
// Apply (and undo) temporary composition underlines and selection colors.
void ApplyCompositionAndSelectionStyles();
@@ -470,7 +470,7 @@ class UI_EXPORT RenderText {
void DrawSelection(Canvas* canvas);
// Logical UTF-16 string data to be drawn.
- string16 text_;
+ base::string16 text_;
// Horizontal alignment of the text with respect to |display_rect_|. The
// default is to align left if the application UI is LTR and right if RTL.
@@ -536,7 +536,7 @@ class UI_EXPORT RenderText {
// A flag and the text to display for obscured (password) fields.
// Asterisks are used instead of the actual text glyphs when true.
bool obscured_;
- string16 obscured_text_;
+ base::string16 obscured_text_;
// The index at which the char should be revealed in the obscured text.
int obscured_reveal_index_;
« no previous file with comments | « ui/gfx/platform_font_win.cc ('k') | ui/gfx/render_text.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698