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

Unified Diff: ui/base/resource/resource_bundle.h

Issue 100303003: Move more uses of string16 to specify base:: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/base/l10n/time_format.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index bea12c19a25d65067a9989d43293a58a34d64bf9..272c5b3341bd3252508a29630d1084b9e410127f 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -105,7 +105,7 @@ class UI_EXPORT ResourceBundle {
// Retrieve a localized string. Return true if a string was provided or
// false to attempt retrieval of the default string.
- virtual bool GetLocalizedString(int message_id, string16* value) = 0;
+ virtual bool GetLocalizedString(int message_id, base::string16* value) = 0;
// Returns a font or NULL to attempt retrieval of the default resource.
virtual scoped_ptr<gfx::Font> GetFont(FontStyle style) = 0;
@@ -230,7 +230,7 @@ class UI_EXPORT ResourceBundle {
// Get a localized string given a message id. Returns an empty
// string if the message_id is not found.
- string16 GetLocalizedString(int message_id);
+ base::string16 GetLocalizedString(int message_id);
// Returns the font list for the specified style.
const gfx::FontList& GetFontList(FontStyle style);
« no previous file with comments | « ui/base/l10n/time_format.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698