| Index: app/resource_bundle_mac.mm
|
| diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm
|
| index e96ed548382cb7373df8e546342aa699e6d6b737..6696617cd1c5b66aa2fe8b979072949a17b2348f 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<unsigned char>* 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).
|
|
|