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 /app/resource_bundle_linux.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 'app/resource_bundle_linux.cc')
-rw-r--r-- | app/resource_bundle_linux.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc index c84fa33..85f00c6 100644 --- a/app/resource_bundle_linux.cc +++ b/app/resource_bundle_linux.cc @@ -121,7 +121,7 @@ void ResourceBundle::LoadThemeResources() { bool ResourceBundle::LoadResourceBytes(DataHandle module, int resource_id, std::vector<unsigned char>* bytes) { DCHECK(module); - StringPiece data; + base::StringPiece data; if (!module->Get(resource_id, &data)) return false; @@ -131,11 +131,11 @@ bool ResourceBundle::LoadResourceBytes(DataHandle module, int resource_id, return true; } -StringPiece ResourceBundle::GetRawDataResource(int resource_id) { +base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) { DCHECK(resources_data_); - StringPiece data; + base::StringPiece data; if (!resources_data_->Get(resource_id, &data)) - return StringPiece(); + return base::StringPiece(); return data; } @@ -147,7 +147,7 @@ string16 ResourceBundle::GetLocalizedString(int message_id) { return string16(); } - StringPiece data; + base::StringPiece data; if (!locale_resources_data_->Get(message_id, &data)) { // Fall back on the main data pack (shouldn't be any strings here except in // unittests). |