Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4540)

Unified Diff: chrome/utility/extensions/unpacker.cc

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/utility/extensions/unpacker.h ('k') | chrome/utility/importer/external_process_importer_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/extensions/unpacker.cc
diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc
index 10b95b96d2e9622884d37946b1a6478821c62b6f..75c3741f5ec6e52d0caca96beb49bae47a99a92e 100644
--- a/chrome/utility/extensions/unpacker.cc
+++ b/chrome/utility/extensions/unpacker.cc
@@ -289,7 +289,7 @@ bool Unpacker::ReadMessageCatalog(const base::FilePath& message_path) {
scoped_ptr<base::DictionaryValue> root(static_cast<base::DictionaryValue*>(
serializer.Deserialize(NULL, &error)));
if (!root.get()) {
- string16 messages_file = message_path.LossyDisplayName();
+ base::string16 messages_file = message_path.LossyDisplayName();
if (error.empty()) {
// If file is missing, Deserialize will fail with empty error.
SetError(base::StringPrintf("%s %s", errors::kLocalesMessagesFileMissing,
@@ -323,7 +323,7 @@ void Unpacker::SetError(const std::string &error) {
SetUTF16Error(UTF8ToUTF16(error));
}
-void Unpacker::SetUTF16Error(const string16 &error) {
+void Unpacker::SetUTF16Error(const base::string16& error) {
error_message_ = error;
}
« no previous file with comments | « chrome/utility/extensions/unpacker.h ('k') | chrome/utility/importer/external_process_importer_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698