From 8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Thu, 10 Sep 2009 21:08:39 +0000 Subject: 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 --- app/resource_bundle_mac.mm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/resource_bundle_mac.mm') diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm index e96ed54..6696617 100644 --- a/app/resource_bundle_mac.mm +++ b/app/resource_bundle_mac.mm @@ -75,7 +75,7 @@ void ResourceBundle::LoadThemeResources() { bool ResourceBundle::LoadResourceBytes(DataHandle module, int resource_id, std::vector* bytes) { DCHECK(module); - StringPiece data; + base::StringPiece data; if (!module->Get(resource_id, &data)) return false; @@ -85,11 +85,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; } @@ -101,7 +101,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). -- cgit v1.1