diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 02:58:15 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 02:58:15 +0000 |
| commit | 7bc5f1bb093daa602ac483051bd0071f8064779b (patch) | |
| tree | 8e6477758b86742c8cc1db6dd5febb3b07762d57 /chrome/browser/extensions/user_script_master.h | |
| parent | cdbc184570cbc8e2838d45e810bc68ef66b7347f (diff) | |
| download | chromium_src-7bc5f1bb093daa602ac483051bd0071f8064779b.zip chromium_src-7bc5f1bb093daa602ac483051bd0071f8064779b.tar.gz chromium_src-7bc5f1bb093daa602ac483051bd0071f8064779b.tar.bz2 | |
Revert 24372 - Delay request loading until all user scripts that request depends on are ready.
BUG=11547
TEST=See bug.
Review URL: http://codereview.chromium.org/173239
TBR=mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/174501
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/user_script_master.h')
| -rw-r--r-- | chrome/browser/extensions/user_script_master.h | 4 |
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 56aab84..557032e 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); - virtual ~UserScriptMaster(); + ~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. - virtual void StartScan(); + void StartScan(); // Gets the segment of shared memory for the scripts. base::SharedMemory* GetSharedMemory() const { |