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

Unified Diff: chrome/browser/sync/sessions/session_state.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
Index: chrome/browser/sync/sessions/session_state.h
===================================================================
--- chrome/browser/sync/sessions/session_state.h (revision 92173)
+++ chrome/browser/sync/sessions/session_state.h (working copy)
@@ -27,7 +27,9 @@
#include "chrome/browser/sync/syncable/model_type_payload_map.h"
#include "chrome/browser/sync/syncable/syncable.h"
+namespace base {
class DictionaryValue;
+}
namespace syncable {
class DirectoryManager;
@@ -50,7 +52,7 @@
~SyncSourceInfo();
// Caller takes ownership of the returned dictionary.
- DictionaryValue* ToValue() const;
+ base::DictionaryValue* ToValue() const;
sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source;
syncable::ModelTypePayloadMap types;
@@ -62,7 +64,7 @@
~SyncerStatus();
// Caller takes ownership of the returned dictionary.
- DictionaryValue* ToValue() const;
+ base::DictionaryValue* ToValue() const;
// True when we get such an INVALID_STORE error from the server.
bool invalid_store;
@@ -91,7 +93,7 @@
ErrorCounters();
// Caller takes ownership of the returned dictionary.
- DictionaryValue* ToValue() const;
+ base::DictionaryValue* ToValue() const;
int num_conflicting_commits;
@@ -106,7 +108,7 @@
};
// Caller takes ownership of the returned dictionary.
-DictionaryValue* DownloadProgressMarkersToValue(
+base::DictionaryValue* DownloadProgressMarkersToValue(
const std::string
(&download_progress_markers)[syncable::MODEL_TYPE_COUNT]);
@@ -132,7 +134,7 @@
~SyncSessionSnapshot();
// Caller takes ownership of the returned dictionary.
- DictionaryValue* ToValue() const;
+ base::DictionaryValue* ToValue() const;
std::string ToString() const;
« no previous file with comments | « chrome/browser/sync/protocol/proto_value_conversions.h ('k') | chrome/browser/sync/sync_setup_flow_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698