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

Unified Diff: chrome/browser/sync/syncable/model_type.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/sync_ui_util.h ('k') | chrome/browser/sync/syncable/model_type_payload_map.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/model_type.h
===================================================================
--- chrome/browser/sync/syncable/model_type.h (revision 92173)
+++ chrome/browser/sync/syncable/model_type.h (working copy)
@@ -17,8 +17,10 @@
#include "base/logging.h"
#include "base/time.h"
+namespace base {
class ListValue;
class StringValue;
+}
namespace sync_pb {
class EntitySpecifics;
@@ -116,7 +118,7 @@
// Handles all model types, and not just real ones.
//
// Caller takes ownership of returned value.
-StringValue* ModelTypeToValue(ModelType model_type);
+base::StringValue* ModelTypeToValue(ModelType model_type);
std::string ModelTypeSetToString(const ModelTypeSet& model_types);
@@ -135,10 +137,10 @@
ModelTypeBitSet ModelTypeBitSetFromSet(const ModelTypeSet& set);
// Caller takes ownership of returned list.
-ListValue* ModelTypeBitSetToValue(const ModelTypeBitSet& model_types);
+base::ListValue* ModelTypeBitSetToValue(const ModelTypeBitSet& model_types);
// Caller takes ownership of returned list.
-ListValue* ModelTypeSetToValue(const ModelTypeSet& model_types);
+base::ListValue* ModelTypeSetToValue(const ModelTypeSet& model_types);
// Returns a string corresponding to the syncable tag for this datatype.
std::string ModelTypeToRootTag(ModelType type);
« no previous file with comments | « chrome/browser/sync/sync_ui_util.h ('k') | chrome/browser/sync/syncable/model_type_payload_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698