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

Unified Diff: app/resource_bundle.h

Issue 193072: Move StringPiece into the base namespace. It is colliding (Closed)
Patch Set: take 2 Created 11 years, 3 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 | app/resource_bundle_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/resource_bundle.h
diff --git a/app/resource_bundle.h b/app/resource_bundle.h
index 52c85c5a7c390c167062830deaa30a07d192545b..23f39c5e0ab21f919baf737ec2f19f2d21e4ccc1 100644
--- a/app/resource_bundle.h
+++ b/app/resource_bundle.h
@@ -33,7 +33,9 @@ class Font;
}
class SkBitmap;
typedef uint32 SkColor;
+namespace base {
class StringPiece;
+}
#if defined(OS_MACOSX)
#ifdef __OBJC__
@@ -105,7 +107,7 @@ class ResourceBundle {
// Like GetDataResource(), but avoids copying the resource. Instead, it
// returns a StringPiece which points into the actual resource in the image.
- StringPiece GetRawDataResource(int resource_id);
+ base::StringPiece GetRawDataResource(int resource_id);
// Get a localized string given a message id. Returns an empty
// string if the message_id is not found.
« no previous file with comments | « no previous file | app/resource_bundle_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698