summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/user_script_master.h
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 17:18:14 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 17:18:14 +0000
commit5fd9834def74734fe62be06ad9914d0656534837 (patch)
tree8b0eee1c27c7ba550141b7a7a9b8ca1b7fab54b1 /chrome/browser/extensions/user_script_master.h
parent16f89d074dd62b9850adfc988c02e385da465124 (diff)
downloadchromium_src-5fd9834def74734fe62be06ad9914d0656534837.zip
chromium_src-5fd9834def74734fe62be06ad9914d0656534837.tar.gz
chromium_src-5fd9834def74734fe62be06ad9914d0656534837.tar.bz2
Re-try r24372 - Delay request loading until all user scripts that request
depends on are ready. UMR should be fixed after setting new appcache variable. BUG=no TEST=no Review URL: http://codereview.chromium.org/173482 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/user_script_master.h')
-rw-r--r--chrome/browser/extensions/user_script_master.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index 557032e..56aab84 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -28,7 +28,7 @@ class UserScriptMaster : public base::RefCounted<UserScriptMaster>,
// script-reloading worker on as well as the path the scripts live in.
// These are normally the file thread and a directory inside the profile.
UserScriptMaster(MessageLoop* worker, const FilePath& script_dir);
- ~UserScriptMaster();
+ virtual ~UserScriptMaster();
// Add a watched directory. All scripts will be reloaded when any file in
// this directory changes.
@@ -36,7 +36,7 @@ class UserScriptMaster : public base::RefCounted<UserScriptMaster>,
// Kicks off a process on the file thread to reload scripts from disk
// into a new chunk of shared memory and notify renderers.
- void StartScan();
+ virtual void StartScan();
// Gets the segment of shared memory for the scripts.
base::SharedMemory* GetSharedMemory() const {