Chromium Code Reviews| Index: chrome/browser/extensions/unpacked_installer.cc |
| diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc |
| index 1a41314a5c92d070d3baec247d5a7d8590a3c9dc..ee7b29b4b354ad7c61ed73caa9b9eb6e7a46647a 100644 |
| --- a/chrome/browser/extensions/unpacked_installer.cc |
| +++ b/chrome/browser/extensions/unpacked_installer.cc |
| @@ -285,32 +285,20 @@ void UnpackedInstaller::LoadWithFileAccess(int flags) { |
| return; |
| } |
| - // The installation prompt is about to be shown, which means we're past the |
| - // point of detecting installation errors. We can now safely remove the retry |
| - // handler that listens for them. |
| - BrowserThread::PostTask( |
| - BrowserThread::UI, |
| - FROM_HERE, |
| - base::Bind(&UnpackedInstaller::UnregisterLoadRetryListener, this)); |
| - |
| BrowserThread::PostTask( |
| BrowserThread::UI, |
| FROM_HERE, |
| base::Bind(&UnpackedInstaller::ShowInstallPrompt, this)); |
| } |
| -void UnpackedInstaller::UnregisterLoadRetryListener() { |
| - CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| - if (!service_weak_.get()) |
| - return; |
| - service_weak_->NotifyLoadRetry(false, extension_path_); |
| -} |
| - |
| void UnpackedInstaller::ReportExtensionLoadError(const std::string &error) { |
| CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| + if (!on_failure_callback_.is_null()) |
| + on_failure_callback_.Run(extension_path_, error); |
| + |
| if (!service_weak_.get()) |
| return; |
|
not at google - send to devlin
2014/04/25 17:10:20
this file is quite broken, but I'm scared to touch
Devlin
2014/04/25 18:13:12
Done.
|
| - service_weak_->ReportExtensionLoadError(extension_path_, error, true); |
| + service_weak_->ReportExtensionLoadError(extension_path_, error); |
| } |
| void UnpackedInstaller::ConfirmInstall() { |