| Index: chrome/browser/sync/engine/syncapi.h
|
| ===================================================================
|
| --- chrome/browser/sync/engine/syncapi.h (revision 92173)
|
| +++ chrome/browser/sync/engine/syncapi.h (working copy)
|
| @@ -55,9 +55,12 @@
|
| #include "chrome/common/net/gaia/google_service_auth_error.h"
|
| #include "googleurl/src/gurl.h"
|
|
|
| -class DictionaryValue;
|
| class FilePath;
|
|
|
| +namespace base {
|
| +class DictionaryValue;
|
| +}
|
| +
|
| namespace browser_sync {
|
| class JsBackend;
|
| class ModelSafeWorkerRegistrar;
|
| @@ -284,11 +287,11 @@
|
|
|
| // Dumps a summary of node info into a DictionaryValue and returns it.
|
| // Transfers ownership of the DictionaryValue to the caller.
|
| - DictionaryValue* GetSummaryAsValue() const;
|
| + base::DictionaryValue* GetSummaryAsValue() const;
|
|
|
| // Dumps all node details into a DictionaryValue and returns it.
|
| // Transfers ownership of the DictionaryValue to the caller.
|
| - DictionaryValue* GetDetailsAsValue() const;
|
| + base::DictionaryValue* GetDetailsAsValue() const;
|
|
|
| protected:
|
| BaseNode();
|
| @@ -632,7 +635,7 @@
|
| virtual ~ExtraPasswordChangeRecordData();
|
|
|
| // Transfers ownership of the DictionaryValue to the caller.
|
| - virtual DictionaryValue* ToValue() const;
|
| + virtual base::DictionaryValue* ToValue() const;
|
|
|
| const sync_pb::PasswordSpecificsData& unencrypted() const;
|
| private:
|
| @@ -653,7 +656,7 @@
|
| ~ChangeRecord();
|
|
|
| // Transfers ownership of the DictionaryValue to the caller.
|
| - DictionaryValue* ToValue(const BaseTransaction* trans) const;
|
| + base::DictionaryValue* ToValue(const BaseTransaction* trans) const;
|
|
|
| int64 id;
|
| Action action;
|
|
|