| Index: chrome/utility/extensions/unpacker.h
|
| diff --git a/chrome/utility/extensions/unpacker.h b/chrome/utility/extensions/unpacker.h
|
| index 53e866b5760b35bfc5505dcc514232392c73631d..8d44b1b1961d9641f89a1f3c3540baf0b1b3aaf0 100644
|
| --- a/chrome/utility/extensions/unpacker.h
|
| +++ b/chrome/utility/extensions/unpacker.h
|
| @@ -46,7 +46,7 @@ class Unpacker {
|
| // success.
|
| bool DumpMessageCatalogsToFile();
|
|
|
| - const string16& error_message() { return error_message_; }
|
| + const base::string16& error_message() { return error_message_; }
|
| base::DictionaryValue* parsed_manifest() {
|
| return parsed_manifest_.get();
|
| }
|
| @@ -70,7 +70,7 @@ class Unpacker {
|
|
|
| // Set the error message.
|
| void SetError(const std::string& error);
|
| - void SetUTF16Error(const string16& error);
|
| + void SetUTF16Error(const base::string16& error);
|
|
|
| // The extension to unpack.
|
| base::FilePath extension_path_;
|
| @@ -100,7 +100,7 @@ class Unpacker {
|
| scoped_ptr<base::DictionaryValue> parsed_catalogs_;
|
|
|
| // The last error message that was set. Empty if there were no errors.
|
| - string16 error_message_;
|
| + base::string16 error_message_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Unpacker);
|
| };
|
|
|