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/sessions | |
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/sessions')
-rw-r--r-- | sync/sessions/debug_info_getter.h | 2 | ||||
-rw-r--r-- | sync/sessions/directory_type_debug_info_emitter.h | 2 | ||||
-rw-r--r-- | sync/sessions/model_type_registry.h | 13 | ||||
-rw-r--r-- | sync/sessions/nudge_tracker.h | 2 | ||||
-rw-r--r-- | sync/sessions/status_controller.h | 4 | ||||
-rw-r--r-- | sync/sessions/sync_session.h | 4 | ||||
-rw-r--r-- | sync/sessions/sync_session_context.h | 3 |
7 files changed, 16 insertions, 14 deletions
diff --git a/sync/sessions/debug_info_getter.h b/sync/sessions/debug_info_getter.h index 7efe0cb..43c9349 100644 --- a/sync/sessions/debug_info_getter.h +++ b/sync/sessions/debug_info_getter.h @@ -13,7 +13,7 @@ namespace sessions { // This is the interface that needs to be implemented by the event listener // to communicate the debug info data to the syncer. -class SYNC_EXPORT_PRIVATE DebugInfoGetter { +class SYNC_EXPORT DebugInfoGetter { public: // Gets the client debug info. Be sure to clear the info to ensure the data // isn't sent multiple times. diff --git a/sync/sessions/directory_type_debug_info_emitter.h b/sync/sessions/directory_type_debug_info_emitter.h index 254e3f9..aa55e3b 100644 --- a/sync/sessions/directory_type_debug_info_emitter.h +++ b/sync/sessions/directory_type_debug_info_emitter.h @@ -33,7 +33,7 @@ class TypeDebugInfoObserver; // is delegated to the UpdateHandler and CommitContributors. For the Stats // counters, the emitter will use its type_ and directory_ members to fetch all // the required information on demand. -class SYNC_EXPORT_PRIVATE DirectoryTypeDebugInfoEmitter { +class SYNC_EXPORT DirectoryTypeDebugInfoEmitter { public: // Standard constructor for non-tests. // diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h index 6ac0c7c..c79173e 100644 --- a/sync/sessions/model_type_registry.h +++ b/sync/sessions/model_type_registry.h @@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_ENGINE_MODEL_TYPE_REGISTRY_H_ -#define SYNC_ENGINE_MODEL_TYPE_REGISTRY_H_ +#ifndef SYNC_SESSIONS_MODEL_TYPE_REGISTRY_H_ +#define SYNC_SESSIONS_MODEL_TYPE_REGISTRY_H_ #include <map> +#include <string> +#include <vector> #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -44,9 +46,8 @@ typedef std::map<ModelType, DirectoryTypeDebugInfoEmitter*> DirectoryTypeDebugInfoEmitterMap; // Keeps track of the sets of active update handlers and commit contributors. -class SYNC_EXPORT_PRIVATE ModelTypeRegistry - : public syncer_v2::SyncContext, - public SyncEncryptionHandler::Observer { +class SYNC_EXPORT ModelTypeRegistry : public syncer_v2::SyncContext, + public SyncEncryptionHandler::Observer { public: // Constructs a ModelTypeRegistry that supports directory types. ModelTypeRegistry(const std::vector<scoped_refptr<ModelSafeWorker> >& workers, @@ -162,4 +163,4 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry } // namespace syncer -#endif // SYNC_ENGINE_MODEL_TYPE_REGISTRY_H_ +#endif // SYNC_SESSIONS_MODEL_TYPE_REGISTRY_H_ diff --git a/sync/sessions/nudge_tracker.h b/sync/sessions/nudge_tracker.h index f4c1e42..eb74d06 100644 --- a/sync/sessions/nudge_tracker.h +++ b/sync/sessions/nudge_tracker.h @@ -25,7 +25,7 @@ class ObjectIdInvalidationMap; namespace sessions { -class SYNC_EXPORT_PRIVATE NudgeTracker { +class SYNC_EXPORT NudgeTracker { public: static size_t kDefaultMaxPayloadsPerType; diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h index b6f1003..144228b 100644 --- a/sync/sessions/status_controller.h +++ b/sync/sessions/status_controller.h @@ -30,9 +30,9 @@ namespace syncer { namespace sessions { -class SYNC_EXPORT_PRIVATE StatusController { +class SYNC_EXPORT StatusController { public: - explicit StatusController(); + StatusController(); ~StatusController(); // ClientToServer messages. diff --git a/sync/sessions/sync_session.h b/sync/sessions/sync_session.h index fd20132..e96b640 100644 --- a/sync/sessions/sync_session.h +++ b/sync/sessions/sync_session.h @@ -36,12 +36,12 @@ namespace sessions { class NudgeTracker; -class SYNC_EXPORT_PRIVATE SyncSession { +class SYNC_EXPORT SyncSession { public: // The Delegate services events that occur during the session requiring an // explicit (and session-global) action, as opposed to events that are simply // recorded in per-session state. - class SYNC_EXPORT_PRIVATE Delegate { + class SYNC_EXPORT Delegate { public: // The client was throttled and should cease-and-desist syncing activity // until the specified time. diff --git a/sync/sessions/sync_session_context.h b/sync/sessions/sync_session_context.h index afce0a8..058244c 100644 --- a/sync/sessions/sync_session_context.h +++ b/sync/sessions/sync_session_context.h @@ -16,6 +16,7 @@ #define SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_ #include <string> +#include <vector> #include "sync/base/sync_export.h" #include "sync/engine/sync_engine_event_listener.h" @@ -38,7 +39,7 @@ static const int kDefaultMaxCommitBatchSize = 25; namespace sessions { class TestScopedSessionEventListener; -class SYNC_EXPORT_PRIVATE SyncSessionContext { +class SYNC_EXPORT SyncSessionContext { public: SyncSessionContext( ServerConnectionManager* connection_manager, |