diff options
| author | skym <skym@chromium.org> | 2015-12-10 16:27:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-11 00:28:35 +0000 |
| commit | 6344d79c2f94876e979d4760816090442c694845 (patch) | |
| tree | f9335bfe1593410b37ee62409de70ae6c24317ee /sync/engine/sync_scheduler_impl.h | |
| parent | 64e809d03a59d44e42960058371035866f8a1038 (diff) | |
| download | chromium_src-6344d79c2f94876e979d4760816090442c694845.zip chromium_src-6344d79c2f94876e979d4760816090442c694845.tar.gz chromium_src-6344d79c2f94876e979d4760816090442c694845.tar.bz2 | |
[Sync] Replacing SYNC_EXPORT_PRIVATE with SYNC_EXPORT for all usage, and fixing lint violations on all touched files.
Leaving the definition of the SYNC_EXPORT_PRIVATE macro because for some strange reason the iOS waterfall bot's incremental build doesn't re-generate the attachment's proto files. This causes a compile failure because the old versions of these generated files use the SYNC_EXPORT_MACRO. It has been difficult to reproduce this problem anywhere else, so it's unclear if something like a white-space change to the .proto definition would resolve this breakage.
BUG=554242, 567301
Review URL: https://codereview.chromium.org/1503343002
Cr-Commit-Position: refs/heads/master@{#364546}
Diffstat (limited to 'sync/engine/sync_scheduler_impl.h')
| -rw-r--r-- | sync/engine/sync_scheduler_impl.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sync/engine/sync_scheduler_impl.h b/sync/engine/sync_scheduler_impl.h index 4e5fb17..acfad93 100644 --- a/sync/engine/sync_scheduler_impl.h +++ b/sync/engine/sync_scheduler_impl.h @@ -37,9 +37,8 @@ namespace sessions { struct ModelNeutralState; } -class SYNC_EXPORT_PRIVATE SyncSchedulerImpl - : public SyncScheduler, - public base::NonThreadSafe { +class SYNC_EXPORT SyncSchedulerImpl : public SyncScheduler, + public base::NonThreadSafe { public: // |name| is a display string to identify the syncer thread. Takes // |ownership of |syncer| and |delay_provider|. @@ -121,7 +120,7 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl FRIEND_TEST_ALL_PREFIXES(SyncSchedulerTest, FailedRetry); FRIEND_TEST_ALL_PREFIXES(SyncSchedulerTest, ReceiveNewRetryDelay); - struct SYNC_EXPORT_PRIVATE WaitInterval { + struct SYNC_EXPORT WaitInterval { enum Mode { // Uninitialized state, should not be set in practice. UNKNOWN = -1, |