Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1067)

Unified Diff: chrome/browser/extensions/crx_installer.h

Issue 10581043: Merge 142921 - Use an infobar instead of alert box for extension install (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/download/download_browsertest.cc ('k') | chrome/browser/extensions/crx_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/crx_installer.h
===================================================================
--- chrome/browser/extensions/crx_installer.h (revision 143212)
+++ chrome/browser/extensions/crx_installer.h (working copy)
@@ -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 @@
// 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 @@
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);
« no previous file with comments | « chrome/browser/download/download_browsertest.cc ('k') | chrome/browser/extensions/crx_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698