| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/crx_installer.h" | 5 #include "chrome/browser/extensions/crx_installer.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 content::Source<CrxInstaller>(this), | 748 content::Source<CrxInstaller>(this), |
| 749 content::Details<const base::string16>(&error.message())); | 749 content::Details<const base::string16>(&error.message())); |
| 750 | 750 |
| 751 // This isn't really necessary, it is only used because unit tests expect to | 751 // This isn't really necessary, it is only used because unit tests expect to |
| 752 // see errors get reported via this interface. | 752 // see errors get reported via this interface. |
| 753 // | 753 // |
| 754 // TODO(aa): Need to go through unit tests and clean them up too, probably get | 754 // TODO(aa): Need to go through unit tests and clean them up too, probably get |
| 755 // rid of this line. | 755 // rid of this line. |
| 756 ExtensionErrorReporter::GetInstance()->ReportError( | 756 ExtensionErrorReporter::GetInstance()->ReportError( |
| 757 error.message(), | 757 error.message(), |
| 758 false, // Be quiet. | 758 false); // Be quiet. |
| 759 NULL); // Caller expects no response. | |
| 760 | 759 |
| 761 if (client_) | 760 if (client_) |
| 762 client_->OnInstallFailure(error); | 761 client_->OnInstallFailure(error); |
| 763 | 762 |
| 764 NotifyCrxInstallComplete(false); | 763 NotifyCrxInstallComplete(false); |
| 765 | 764 |
| 766 // Delete temporary files. | 765 // Delete temporary files. |
| 767 CleanupTempFiles(); | 766 CleanupTempFiles(); |
| 768 } | 767 } |
| 769 | 768 |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 894 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) | 893 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) |
| 895 return; | 894 return; |
| 896 | 895 |
| 897 if (client_) { | 896 if (client_) { |
| 898 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). | 897 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). |
| 899 client_->ConfirmReEnable(this, extension()); | 898 client_->ConfirmReEnable(this, extension()); |
| 900 } | 899 } |
| 901 } | 900 } |
| 902 | 901 |
| 903 } // namespace extensions | 902 } // namespace extensions |
| OLD | NEW |