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

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

Issue 209073: Merge 26476 - Fixed a few data races on reference counters.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/history/history_marshaling.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | chrome/browser/history/history_marshaling.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698