diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 18:42:09 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 18:42:09 +0000 |
| commit | 4704fa5e6894a2ec42cdbcda9da18f8d203e634d (patch) | |
| tree | a7bbfcbc6b1c017152048d05378c0c58951ff512 /chrome/browser/extensions/crx_installer.h | |
| parent | f7158b04f32b8cd19b922bb7b8fccc41a43c5dd4 (diff) | |
| download | chromium_src-4704fa5e6894a2ec42cdbcda9da18f8d203e634d.zip chromium_src-4704fa5e6894a2ec42cdbcda9da18f8d203e634d.tar.gz chromium_src-4704fa5e6894a2ec42cdbcda9da18f8d203e634d.tar.bz2 | |
Merge 142921 - Use an infobar instead of alert box for extension install
error.
Also, setup the 'learn more' link for off-store install
failure, but don't enable yet as we don't quite have anything
to link to.
BUG=55584
TBR=yoz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10559056
TBR=aa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10581043
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@143213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/crx_installer.h')
| -rw-r--r-- | chrome/browser/extensions/crx_installer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h index 4c6c70b..04c4c4a 100644 --- a/chrome/browser/extensions/crx_installer.h +++ b/chrome/browser/extensions/crx_installer.h @@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/version.h" +#include "chrome/browser/extensions/crx_installer_error.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" #include "chrome/browser/extensions/webstore_installer.h" @@ -186,7 +187,7 @@ class CrxInstaller // Called after OnUnpackSuccess as a last check to see whether the install // should complete. - bool AllowInstall(const extensions::Extension* extension, string16* error); + CrxInstallerError AllowInstall(const extensions::Extension* extension); // SandboxedExtensionUnpackerClient virtual void OnUnpackFailure(const string16& error_message) OVERRIDE; @@ -208,8 +209,8 @@ class CrxInstaller void CompleteInstall(); // Result reporting. - void ReportFailureFromFileThread(const string16& error); - void ReportFailureFromUIThread(const string16& error); + void ReportFailureFromFileThread(const CrxInstallerError& error); + void ReportFailureFromUIThread(const CrxInstallerError& error); void ReportSuccessFromFileThread(); void ReportSuccessFromUIThread(); void NotifyCrxInstallComplete(const extensions::Extension* extension); |