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

Unified Diff: chrome/browser/sync/syncable/syncable.h

Issue 7259019: Move base/values.h into the base namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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 | « chrome/browser/sync/syncable/model_type_payload_map.h ('k') | chrome/browser/sync/syncable/syncable_id.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/syncable.h
===================================================================
--- chrome/browser/sync/syncable/syncable.h (revision 92173)
+++ chrome/browser/sync/syncable/syncable.h (working copy)
@@ -33,9 +33,13 @@
#include "chrome/browser/sync/util/dbgq.h"
#include "chrome/common/deprecated/event_sys.h"
-class DictionaryValue;
struct PurgeInfo;
+namespace base {
+class DictionaryValue;
+class ListValue;
+}
+
namespace sync_api {
class ReadTransaction;
class WriteNode;
@@ -344,7 +348,7 @@
// Dumps all kernel info into a DictionaryValue and returns it.
// Transfers ownership of the DictionaryValue to the caller.
- DictionaryValue* ToValue() const;
+ base::DictionaryValue* ToValue() const;
private:
// Tracks whether this entry needs to be saved to the database.
@@ -434,7 +438,7 @@
// Dumps all entry info into a DictionaryValue and returns it.
// Transfers ownership of the DictionaryValue to the caller.
- DictionaryValue* ToValue() const;
+ base::DictionaryValue* ToValue() const;
protected: // Don't allow creation on heap, except by sync API wrappers.
friend class sync_api::ReadNode;
@@ -567,7 +571,7 @@
EntryKernelMutationSet;
// Caller owns the return value.
-ListValue* EntryKernelMutationSetToValue(
+base::ListValue* EntryKernelMutationSetToValue(
const EntryKernelMutationSet& mutations);
// How syncable indices & Indexers work.
« no previous file with comments | « chrome/browser/sync/syncable/model_type_payload_map.h ('k') | chrome/browser/sync/syncable/syncable_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698