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

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

Issue 12211029: Sanity tweaks to the extension blacklist: check all extensions at once on (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more test fixes Created 7 years, 10 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/extensions/blacklist.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
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index a939003359187cdead2ad7c4059e55e3ab64e191..a0152f1b27ab8aece309531fb59ed7f5812239ab 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -130,6 +130,10 @@ class CrxInstaller
bool allow_silent_install() const { return allow_silent_install_; }
void set_allow_silent_install(bool val) { allow_silent_install_ = val; }
+ void set_bypass_blacklist_for_test(bool val) {
+ bypass_blacklist_for_test_ = val;
+ }
+
bool is_gallery_install() const {
return (creation_flags_ & Extension::FROM_WEBSTORE) > 0;
}
@@ -217,10 +221,6 @@ class CrxInstaller
const base::DictionaryValue* original_manifest,
const Extension* extension) OVERRIDE;
- // Returns true if we can skip confirmation because the install was
- // whitelisted.
- bool CanSkipConfirmation();
-
// Called on the UI thread to start the requirements check on the extension.
void CheckRequirements();
@@ -240,7 +240,9 @@ class CrxInstaller
void ReportFailureFromUIThread(const CrxInstallerError& error);
void ReportSuccessFromFileThread();
void ReportSuccessFromUIThread();
- void NotifyCrxInstallComplete(const Extension* extension);
+ void HandleIsBlacklistedResponse(const base::Closure& on_success,
+ bool success);
+ void NotifyCrxInstallComplete(bool success);
// Deletes temporary directory and crx file if needed.
void CleanupTempFiles();
@@ -343,11 +345,12 @@ class CrxInstaller
// Allows for the possibility of a normal install (one in which a |client|
// is provided in the ctor) to procede without showing the permissions prompt
- // dialog. Note that this will only take place if |allow_silent_install_|
- // is true AND the unpacked id of the extension is whitelisted with
- // SetWhitelistedInstallId().
+ // dialog.
bool allow_silent_install_;
+ // Allows for bypassing the blacklist check. Only use for tests.
+ bool bypass_blacklist_for_test_;
+
// The value of the content type header sent with the CRX.
// Ignorred unless |require_extension_mime_type_| is true.
std::string original_mime_type_;
« no previous file with comments | « chrome/browser/extensions/blacklist.cc ('k') | chrome/browser/extensions/crx_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698