diff options
| author | maxbogue <maxbogue@chromium.org> | 2015-08-31 14:08:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-31 21:09:03 +0000 |
| commit | 93150a5d809266f0ce6826360e5c19b86558ba55 (patch) | |
| tree | ef53622135edb246b571b9ce209b293bde8c27b1 /sync/internal_api/public | |
| parent | 1f4ae284499d398785c119f9aab2b69adeb861b8 (diff) | |
| download | chromium_src-93150a5d809266f0ce6826360e5c19b86558ba55.zip chromium_src-93150a5d809266f0ce6826360e5c19b86558ba55.tar.gz chromium_src-93150a5d809266f0ce6826360e5c19b86558ba55.tar.bz2 | |
[Sync] Componentize about_sync_util.
This required SyncTokenStatus and 11 methods be moved from
ProfileSyncService to SyncService. Additionally,
ConnectionStatus has been moved to its own file so
dependents on it don't need to include sync_manager.h.
BUG=511231
TBR=estade
Review URL: https://codereview.chromium.org/1309513002
Cr-Commit-Position: refs/heads/master@{#346468}
Diffstat (limited to 'sync/internal_api/public')
| -rw-r--r-- | sync/internal_api/public/connection_status.h | 20 | ||||
| -rw-r--r-- | sync/internal_api/public/sync_manager.h | 9 | ||||
| -rw-r--r-- | sync/internal_api/public/util/sync_string_conversions.h | 2 |
3 files changed, 22 insertions, 9 deletions
diff --git a/sync/internal_api/public/connection_status.h b/sync/internal_api/public/connection_status.h new file mode 100644 index 0000000..fe24b47 --- /dev/null +++ b/sync/internal_api/public/connection_status.h @@ -0,0 +1,20 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef SYNC_INTERNAL_API_PUBLIC_CONNECTION_STATUS_H_ +#define SYNC_INTERNAL_API_PUBLIC_CONNECTION_STATUS_H_ + +namespace syncer { + +// Status of the sync connection to the server. +enum ConnectionStatus { + CONNECTION_NOT_ATTEMPTED, + CONNECTION_OK, + CONNECTION_AUTH_ERROR, + CONNECTION_SERVER_ERROR +}; + +} // namespace syncer + +#endif // SYNC_INTERNAL_API_PUBLIC_CONNECTION_STATUS_H_ diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h index 2f088fa..fc057b8 100644 --- a/sync/internal_api/public/sync_manager.h +++ b/sync/internal_api/public/sync_manager.h @@ -22,6 +22,7 @@ #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/change_record.h" #include "sync/internal_api/public/configure_reason.h" +#include "sync/internal_api/public/connection_status.h" #include "sync/internal_api/public/engine/model_safe_worker.h" #include "sync/internal_api/public/engine/sync_status.h" #include "sync/internal_api/public/events/protocol_event.h" @@ -61,14 +62,6 @@ namespace sessions { class SyncSessionSnapshot; } // namespace sessions -// Used by SyncManager::OnConnectionStatusChange(). -enum ConnectionStatus { - CONNECTION_NOT_ATTEMPTED, - CONNECTION_OK, - CONNECTION_AUTH_ERROR, - CONNECTION_SERVER_ERROR -}; - // Contains everything needed to talk to and identify a user account. struct SYNC_EXPORT SyncCredentials { SyncCredentials(); diff --git a/sync/internal_api/public/util/sync_string_conversions.h b/sync/internal_api/public/util/sync_string_conversions.h index 0b33a7d..9d45572 100644 --- a/sync/internal_api/public/util/sync_string_conversions.h +++ b/sync/internal_api/public/util/sync_string_conversions.h @@ -6,8 +6,8 @@ #define SYNC_INTERNAL_API_PUBLIC_UTIL_SYNC_STRING_CONVERSIONS_H_ #include "sync/base/sync_export.h" +#include "sync/internal_api/public/connection_status.h" #include "sync/internal_api/public/sync_encryption_handler.h" -#include "sync/internal_api/public/sync_manager.h" namespace syncer { |