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

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

Issue 266963003: Beginning of support for extension content verification (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops, forgot to upload minor cosmetic changes to test Created 6 years, 7 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/user_script_master.h
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index 91fd3ed2544c39ee185d504ea847575fe2e0cd56..909bf8bffc65a15e824b516ca7f43ee3b847b7f9 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -27,6 +27,7 @@ class Profile;
namespace extensions {
+class ContentVerifier;
class ExtensionRegistry;
typedef std::map<std::string, ExtensionSet::ExtensionPathAndDefaultLocale>
@@ -55,6 +56,9 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
// Return true if we have any scripts ready.
bool ScriptsReady() const { return shared_memory_.get() != NULL; }
+ // Returns the content verifier for our browser context.
+ ContentVerifier* content_verifier();
+
protected:
friend class base::RefCountedThreadSafe<UserScriptMaster>;
@@ -79,7 +83,7 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
// Start loading of scripts.
// Will always send a message to the master upon completion.
void StartLoad(const UserScriptList& external_scripts,
- const ExtensionsInfo& extension_info_);
+ const ExtensionsInfo& extensions_info);
// The master is going away; don't call it back.
void DisownMaster() {
@@ -126,6 +130,8 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
// Expected to always outlive us.
content::BrowserThread::ID master_thread_id_;
+ scoped_refptr<ContentVerifier> verifier_;
+
DISALLOW_COPY_AND_ASSIGN(ScriptReloader);
};

Powered by Google App Engine
This is Rietveld 408576698