| Index: chrome/browser/extensions/user_script_master.h
|
| ===================================================================
|
| --- chrome/browser/extensions/user_script_master.h (revision 26882)
|
| +++ chrome/browser/extensions/user_script_master.h (working copy)
|
| @@ -20,7 +20,7 @@
|
|
|
| // Manages a segment of shared memory that contains the user scripts the user
|
| // has installed. Lives on the UI thread.
|
| -class UserScriptMaster : public base::RefCounted<UserScriptMaster>,
|
| +class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
|
| public DirectoryWatcher::Delegate,
|
| public NotificationObserver {
|
| public:
|
|
|
| Property changes on: chrome\browser\extensions\user_script_master.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/chrome/browser/extensions/user_script_master.h:r69-2775
|
| Merged /trunk/src/chrome/browser/extensions/user_script_master.h:r26476
|
|
|
|
|