OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/browser/extensions/zipfile_installer.h" | 5 #include "chrome/browser/extensions/zipfile_installer.h" |
6 | 6 |
7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "chrome/browser/extensions/extension_error_reporter.h" | 9 #include "chrome/browser/extensions/extension_error_reporter.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 } | 34 } |
35 | 35 |
36 void ZipFileInstaller::LoadFromZipFile(const base::FilePath& zip_file) { | 36 void ZipFileInstaller::LoadFromZipFile(const base::FilePath& zip_file) { |
37 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 37 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
38 DCHECK(!zip_file.empty()); | 38 DCHECK(!zip_file.empty()); |
39 | 39 |
40 zip_file_ = zip_file; | 40 zip_file_ = zip_file; |
41 | 41 |
42 content::BrowserThread::PostTask( | 42 content::BrowserThread::PostTask( |
43 content::BrowserThread::FILE, FROM_HERE, | 43 content::BrowserThread::FILE, FROM_HERE, |
44 base::Bind(&ZipFileInstaller::PrepareUnzipDir, this, zip_file)); | 44 base::BindOnce(&ZipFileInstaller::PrepareUnzipDir, this, zip_file)); |
45 } | 45 } |
46 | 46 |
47 ZipFileInstaller::ZipFileInstaller(ExtensionService* service) | 47 ZipFileInstaller::ZipFileInstaller(ExtensionService* service) |
48 : be_noisy_on_failure_(true), | 48 : be_noisy_on_failure_(true), |
49 extension_service_weak_(service->AsWeakPtr()) {} | 49 extension_service_weak_(service->AsWeakPtr()) {} |
50 | 50 |
51 ZipFileInstaller::~ZipFileInstaller() = default; | 51 ZipFileInstaller::~ZipFileInstaller() = default; |
52 | 52 |
53 void ZipFileInstaller::PrepareUnzipDir(const base::FilePath& zip_file) { | 53 void ZipFileInstaller::PrepareUnzipDir(const base::FilePath& zip_file) { |
54 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); | 54 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); |
55 | 55 |
56 base::FilePath dir_temp; | 56 base::FilePath dir_temp; |
57 base::PathService::Get(base::DIR_TEMP, &dir_temp); | 57 base::PathService::Get(base::DIR_TEMP, &dir_temp); |
58 | 58 |
59 base::FilePath::StringType dir_name = | 59 base::FilePath::StringType dir_name = |
60 zip_file.RemoveExtension().BaseName().value() + FILE_PATH_LITERAL("_"); | 60 zip_file.RemoveExtension().BaseName().value() + FILE_PATH_LITERAL("_"); |
61 | 61 |
62 base::FilePath unzip_dir; | 62 base::FilePath unzip_dir; |
63 if (!base::CreateTemporaryDirInDir(dir_temp, dir_name, &unzip_dir)) { | 63 if (!base::CreateTemporaryDirInDir(dir_temp, dir_name, &unzip_dir)) { |
64 content::BrowserThread::PostTask( | 64 content::BrowserThread::PostTask( |
65 content::BrowserThread::UI, FROM_HERE, | 65 content::BrowserThread::UI, FROM_HERE, |
66 base::Bind(&ZipFileInstaller::ReportFailure, this, | 66 base::BindOnce(&ZipFileInstaller::ReportFailure, this, |
67 std::string(kExtensionHandlerTempDirError))); | 67 std::string(kExtensionHandlerTempDirError))); |
68 return; | 68 return; |
69 } | 69 } |
70 | 70 |
71 content::BrowserThread::PostTask( | 71 content::BrowserThread::PostTask( |
72 content::BrowserThread::UI, FROM_HERE, | 72 content::BrowserThread::UI, FROM_HERE, |
73 base::Bind(&ZipFileInstaller::Unzip, this, unzip_dir)); | 73 base::BindOnce(&ZipFileInstaller::Unzip, this, unzip_dir)); |
74 } | 74 } |
75 | 75 |
76 void ZipFileInstaller::Unzip(const base::FilePath& unzip_dir) { | 76 void ZipFileInstaller::Unzip(const base::FilePath& unzip_dir) { |
77 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 77 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
78 DCHECK(!utility_process_mojo_client_); | 78 DCHECK(!utility_process_mojo_client_); |
79 | 79 |
80 utility_process_mojo_client_ = base::MakeUnique< | 80 utility_process_mojo_client_ = base::MakeUnique< |
81 content::UtilityProcessMojoClient<mojom::ExtensionUnpacker>>( | 81 content::UtilityProcessMojoClient<mojom::ExtensionUnpacker>>( |
82 l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_ZIP_FILE_INSTALLER_NAME)); | 82 l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_ZIP_FILE_INSTALLER_NAME)); |
83 utility_process_mojo_client_->set_error_callback( | 83 utility_process_mojo_client_->set_error_callback( |
(...skipping 27 matching lines...) Expand all Loading... |
111 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 111 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
112 | 112 |
113 if (extension_service_weak_) { | 113 if (extension_service_weak_) { |
114 ExtensionErrorReporter::GetInstance()->ReportLoadError( | 114 ExtensionErrorReporter::GetInstance()->ReportLoadError( |
115 zip_file_, error, extension_service_weak_->profile(), | 115 zip_file_, error, extension_service_weak_->profile(), |
116 be_noisy_on_failure_); | 116 be_noisy_on_failure_); |
117 } | 117 } |
118 } | 118 } |
119 | 119 |
120 } // namespace extensions | 120 } // namespace extensions |
OLD | NEW |