| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/file_util.h" | 7 #include "base/file_util.h" | 
| 8 #include "base/scoped_handle.h" | 8 #include "base/scoped_handle.h" | 
| 9 #include "base/scoped_temp_dir.h" | 9 #include "base/scoped_temp_dir.h" | 
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" | 
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 136       locale_path.Append(Extension::kMessagesFilename); | 136       locale_path.Append(Extension::kMessagesFilename); | 
| 137 | 137 | 
| 138     if (!ReadMessageCatalog(messages_path)) | 138     if (!ReadMessageCatalog(messages_path)) | 
| 139       return false; | 139       return false; | 
| 140   } | 140   } | 
| 141 | 141 | 
| 142   return true; | 142   return true; | 
| 143 } | 143 } | 
| 144 | 144 | 
| 145 bool ExtensionUnpacker::Run() { | 145 bool ExtensionUnpacker::Run() { | 
| 146   LOG(INFO) << "Installing extension " << extension_path_.value(); | 146   VLOG(1) << "Installing extension " << extension_path_.value(); | 
| 147 | 147 | 
| 148   // <profile>/Extensions/INSTALL_TEMP/<version> | 148   // <profile>/Extensions/INSTALL_TEMP/<version> | 
| 149   temp_install_dir_ = | 149   temp_install_dir_ = | 
| 150     extension_path_.DirName().AppendASCII(filenames::kTempExtensionName); | 150     extension_path_.DirName().AppendASCII(filenames::kTempExtensionName); | 
| 151 | 151 | 
| 152   if (!file_util::CreateDirectory(temp_install_dir_)) { | 152   if (!file_util::CreateDirectory(temp_install_dir_)) { | 
| 153 | 153 | 
| 154 #if defined(OS_WIN) | 154 #if defined(OS_WIN) | 
| 155     std::string dir_string = WideToUTF8(temp_install_dir_.value()); | 155     std::string dir_string = WideToUTF8(temp_install_dir_.value()); | 
| 156 #else | 156 #else | 
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 303 | 303 | 
| 304   parsed_catalogs_->Set(WideToUTF8(relative_path.DirName().ToWStringHack()), | 304   parsed_catalogs_->Set(WideToUTF8(relative_path.DirName().ToWStringHack()), | 
| 305                         root.release()); | 305                         root.release()); | 
| 306 | 306 | 
| 307   return true; | 307   return true; | 
| 308 } | 308 } | 
| 309 | 309 | 
| 310 void ExtensionUnpacker::SetError(const std::string &error) { | 310 void ExtensionUnpacker::SetError(const std::string &error) { | 
| 311   error_message_ = error; | 311   error_message_ = error; | 
| 312 } | 312 } | 
| OLD | NEW | 
|---|