| Index: app/resource_bundle_linux.cc
|
| diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
|
| index c84fa33ea0c6096f8e608c326b872a2d1a3cc6a6..85f00c6787fe0ea32f8286d3d3e1be1c7641d311 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).
|
|
|