Index: chrome/browser/history/history_marshaling.h |
=================================================================== |
--- chrome/browser/history/history_marshaling.h (revision 26882) |
+++ chrome/browser/history/history_marshaling.h (working copy) |
@@ -18,7 +18,8 @@ |
// Navigation ----------------------------------------------------------------- |
// Marshalling structure for AddPage. |
-class HistoryAddPageArgs : public base::RefCounted<HistoryAddPageArgs> { |
+class HistoryAddPageArgs |
+ : public base::RefCountedThreadSafe<HistoryAddPageArgs> { |
public: |
HistoryAddPageArgs(const GURL& arg_url, |
base::Time arg_time, |
Property changes on: chrome\browser\history\history_marshaling.h |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/chrome/browser/history/history_marshaling.h:r69-2775 |
Merged /trunk/src/chrome/browser/history/history_marshaling.h:r26476 |