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

Unified Diff: net/base/net_module.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 | « chrome/tools/mac_helpers/infoplist_strings_util.mm ('k') | net/base/net_module.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_module.h
diff --git a/net/base/net_module.h b/net/base/net_module.h
index 06404d0795f3667d351b35f3264f809b0be2053d..6df4bfe315bc6c28f33356e6c74fcf6ebbe2d916 100644
--- a/net/base/net_module.h
+++ b/net/base/net_module.h
@@ -19,7 +19,7 @@ namespace net {
//
class NetModule {
public:
- typedef StringPiece (*ResourceProvider)(int key);
+ typedef base::StringPiece (*ResourceProvider)(int key);
// Set the function to call when the net module needs resources
static void SetResourceProvider(ResourceProvider func);
@@ -27,7 +27,7 @@ class NetModule {
// Call the resource provider (if one exists) to get the specified resource.
// Returns an empty string if the resource does not exist or if there is no
// resource provider.
- static StringPiece GetResource(int key);
+ static base::StringPiece GetResource(int key);
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(NetModule);
« no previous file with comments | « chrome/tools/mac_helpers/infoplist_strings_util.mm ('k') | net/base/net_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698