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/download | |
| 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/download')
| -rw-r--r-- | chrome/browser/download/download_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 94508eb2..a8fef34 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -163,7 +163,7 @@ class MockAbortExtensionInstallPrompt : public ExtensionInstallPrompt { } virtual void OnInstallSuccess(const Extension* extension, SkBitmap* icon) {} - virtual void OnInstallFailure(const string16& error) {} + virtual void OnInstallFailure(const CrxInstallerError& error) {} }; // Mock that simulates a permissions dialog where the user allows @@ -179,7 +179,7 @@ class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt { } virtual void OnInstallSuccess(const Extension* extension, SkBitmap* icon) {} - virtual void OnInstallFailure(const string16& error) {} + virtual void OnInstallFailure(const CrxInstallerError& error) {} }; static DownloadManager* DownloadManagerForBrowser(Browser* browser) { |