diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:08:39 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:08:39 +0000 |
| commit | 8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee (patch) | |
| tree | 5c07a9d5091a56c6d5a1a2b98ec10d19ae3c20e9 /net/base/net_module.cc | |
| parent | f8dce00e633d5ffde45e008fb8f51d5a76942f6b (diff) | |
| download | chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.zip chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.gz chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.bz2 | |
Move StringPiece into the base namespace. It is colliding
with the StringPiece class in icu4.2, which is a problem
when trying to use the system version of icu.
Review URL: http://codereview.chromium.org/193072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_module.cc')
| -rw-r--r-- | net/base/net_module.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/net_module.cc b/net/base/net_module.cc index de9a586..d7f1918 100644 --- a/net/base/net_module.cc +++ b/net/base/net_module.cc @@ -14,8 +14,8 @@ void NetModule::SetResourceProvider(ResourceProvider func) { } // static -StringPiece NetModule::GetResource(int key) { - return resource_provider ? resource_provider(key) : StringPiece(); +base::StringPiece NetModule::GetResource(int key) { + return resource_provider ? resource_provider(key) : base::StringPiece(); } } // namespace net |