| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/common/extensions/extension_unpacker.h" | 5 #include "chrome/common/extensions/extension_unpacker.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/json/json_value_serializer.h" | 10 #include "base/json/json_value_serializer.h" |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 if (dir_name.empty()) { | 317 if (dir_name.empty()) { |
| 318 NOTREACHED(); | 318 NOTREACHED(); |
| 319 return false; | 319 return false; |
| 320 } | 320 } |
| 321 parsed_catalogs_->Set(dir_name, root.release()); | 321 parsed_catalogs_->Set(dir_name, root.release()); |
| 322 | 322 |
| 323 return true; | 323 return true; |
| 324 } | 324 } |
| 325 | 325 |
| 326 void ExtensionUnpacker::SetError(const std::string &error) { | 326 void ExtensionUnpacker::SetError(const std::string &error) { |
| 327 error_message_ = error; | 327 error_message_ = UTF8ToUTF16(error); |
| 328 } | 328 } |
| OLD | NEW |