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

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

Issue 10689097: Enforce the 'requirements' field in manifests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Conforming to the doc Created 8 years, 5 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
Index: chrome/browser/extensions/unpacked_installer.h
diff --git a/chrome/browser/extensions/unpacked_installer.h b/chrome/browser/extensions/unpacked_installer.h
index 2cc3ec420545a708b23da80af55707d98b108377..f884b29651b3e7cbb3f5cb935dd42e323c2fa89b 100644
--- a/chrome/browser/extensions/unpacked_installer.h
+++ b/chrome/browser/extensions/unpacked_installer.h
@@ -6,9 +6,11 @@
#define CHROME_BROWSER_EXTENSIONS_UNPACKED_INSTALLER_H_
#include <string>
+#include <vector>
#include "base/file_path.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
class ExtensionService;
@@ -16,6 +18,7 @@ class ExtensionService;
namespace extensions {
class Extension;
+class RequirementsChecker;
// Installs and loads an unpacked extension.
// TODO(erikkay): It might be useful to be able to load a packed extension
@@ -47,6 +50,9 @@ class UnpackedInstaller
explicit UnpackedInstaller(ExtensionService* extension_service);
virtual ~UnpackedInstaller();
+ // Callback from RequirementsChecker.
+ void RequirementsChecked(std::vector<std::string> errors);
+
// Verifies if loading unpacked extensions is allowed.
bool IsLoadingUnpackedAllowed() const;
@@ -65,7 +71,7 @@ class UnpackedInstaller
void ReportExtensionLoadError(const std::string& error);
// Called when an unpacked extension has been loaded and installed.
- void OnLoaded(const scoped_refptr<const Extension>& extension);
+ void OnLoaded();
base::WeakPtr<ExtensionService> service_weak_;
@@ -77,6 +83,10 @@ class UnpackedInstaller
// loading.
bool prompt_for_plugins_;
+ scoped_ptr<RequirementsChecker> requirements_checker_;
+
+ scoped_refptr<const Extension> extension_;
+
DISALLOW_COPY_AND_ASSIGN(UnpackedInstaller);
};

Powered by Google App Engine
This is Rietveld 408576698