diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 20:28:07 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 20:28:07 +0000 |
| commit | 4f3837873020736f69b8c3061cc5295d96c68061 (patch) | |
| tree | e72dfb0474129ddc5ae41bdbbe7b076b3fbf143d /sync/internal_api/sync_manager.cc | |
| parent | f26b34f29ec732603e96b73d6f47f27034568e4c (diff) | |
| download | chromium_src-4f3837873020736f69b8c3061cc5295d96c68061.zip chromium_src-4f3837873020736f69b8c3061cc5295d96c68061.tar.gz chromium_src-4f3837873020736f69b8c3061cc5295d96c68061.tar.bz2 | |
[Sync] Move nigori_util* to sync/syncable
It's already in the syncable namespace, so syncable/ seems like
a better place for it.
Move a function from syncer_util.h. to syncable_util.h.
Remove pseudo-namespace class SyncerUtil.
After this change, everything in sync/engine will be in the syncer
namespace.
Also clean up some whitespace.
BUG=128060
TEST=
Review URL: https://chromiumcodereview.appspot.com/10704034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/sync_manager.cc')
| -rw-r--r-- | sync/internal_api/sync_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/internal_api/sync_manager.cc b/sync/internal_api/sync_manager.cc index efdd5a5..9ba62a4 100644 --- a/sync/internal_api/sync_manager.cc +++ b/sync/internal_api/sync_manager.cc @@ -20,7 +20,6 @@ #include "net/base/network_change_notifier.h" #include "sync/engine/all_status.h" #include "sync/engine/net/server_connection_manager.h" -#include "sync/engine/nigori_util.h" #include "sync/engine/sync_scheduler.h" #include "sync/engine/syncer_types.h" #include "sync/engine/throttled_data_type_tracker.h" @@ -56,6 +55,7 @@ #include "sync/syncable/directory_change_delegate.h" #include "sync/syncable/entry.h" #include "sync/syncable/in_memory_directory_backing_store.h" +#include "sync/syncable/nigori_util.h" #include "sync/syncable/on_disk_directory_backing_store.h" #include "sync/util/cryptographer.h" #include "sync/util/get_session_name.h" |