diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 17:25:41 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 17:25:41 +0000 |
| commit | d45f0d9764d93d8f89564a5df7fa505c6a87a6fe (patch) | |
| tree | 89ce4ea823cf922e6955dafcfb275459589cef0a /sync/engine/conflict_resolver.cc | |
| parent | 73e5d26041b0a22e16e383e84a8177930c9fd055 (diff) | |
| download | chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.zip chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.tar.gz chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.tar.bz2 | |
[Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings
Since (almost) everything in sync/ is now in the 'syncer' namespace,
all of these are redundant.
Clean up indentation.
Put sync_{client,listen_notifications} into syncer namespace.
BUG=128060
TEST=
Review URL: https://chromiumcodereview.appspot.com/10795018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/conflict_resolver.cc')
| -rw-r--r-- | sync/engine/conflict_resolver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc index 458c7ce..2a3c62d 100644 --- a/sync/engine/conflict_resolver.cc +++ b/sync/engine/conflict_resolver.cc @@ -221,7 +221,7 @@ ConflictResolver::ProcessSimpleConflict(WriteTransaction* trans, } // We manually merge nigori data. - if (entry.GetModelType() == syncer::NIGORI) { + if (entry.GetModelType() == NIGORI) { // Create a new set of specifics based on the server specifics (which // preserves their encryption keys). sync_pb::EntitySpecifics specifics = |