summaryrefslogtreecommitdiffstats
path: root/sync/util
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-02 08:31:51 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-02 08:31:51 +0000
commitcc7a544c7ed441865a8cabe21409314c857d1831 (patch)
treeed56e6182e951d985abbe2a10c627565e0d90f7e /sync/util
parentdcc72db730c7fb95e9590e01b2e3237d1b13ba98 (diff)
downloadchromium_src-cc7a544c7ed441865a8cabe21409314c857d1831.zip
chromium_src-cc7a544c7ed441865a8cabe21409314c857d1831.tar.gz
chromium_src-cc7a544c7ed441865a8cabe21409314c857d1831.tar.bz2
[sync] Componentize sync: Part 6: Add more SYNC_EXPORTs to files in src/sync/
One of the long term goals of the sync team is to pull sync code out of chrome.dll and into its own component. As of today, several chrome targets depend on various sync targets as defined in sync.gyp. We'd like to move to a world where all chrome targets outside sync.gyp simply depend on the target sync.gyp:sync, which is built into its own component. This patch sets the stage for full componentization by adding SYNC_EXPORT_PRIVATE (and some SYNC_EXPORT) annotations to classes / methods within src/sync so that various chrome targets can reference them. It also makes a few assorted fixes like adding missing destructors, etc. These errors get flagged when component builds are enabled after componentizing sync. The final step of breaking off sync into its own component will be done in https://codereview.chromium.org/11412211. BUG=136928 Review URL: https://codereview.chromium.org/11624037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/util')
-rw-r--r--sync/util/cryptographer.h2
-rw-r--r--sync/util/data_encryption_win.h8
-rw-r--r--sync/util/get_session_name.h2
-rw-r--r--sync/util/time.h2
4 files changed, 8 insertions, 6 deletions
diff --git a/sync/util/cryptographer.h b/sync/util/cryptographer.h
index 384ba78..2dfdedc 100644
--- a/sync/util/cryptographer.h
+++ b/sync/util/cryptographer.h
@@ -24,7 +24,7 @@ namespace syncer {
class Encryptor;
-extern const char kNigoriTag[];
+SYNC_EXPORT_PRIVATE extern const char kNigoriTag[];
// The parameters used to initialize a Nigori instance.
struct KeyParams {
diff --git a/sync/util/data_encryption_win.h b/sync/util/data_encryption_win.h
index 5b7dc09..1b037c7 100644
--- a/sync/util/data_encryption_win.h
+++ b/sync/util/data_encryption_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 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.
@@ -9,11 +9,13 @@
#include <vector>
#include "base/basictypes.h"
+#include "sync/base/sync_export.h"
namespace syncer {
-std::vector<uint8> EncryptData(const std::string& data);
-bool DecryptData(const std::vector<uint8>& in_data, std::string* out_data);
+SYNC_EXPORT_PRIVATE std::vector<uint8> EncryptData(const std::string& data);
+SYNC_EXPORT bool DecryptData(const std::vector<uint8>& in_data,
+ std::string* out_data);
} // namespace syncer
diff --git a/sync/util/get_session_name.h b/sync/util/get_session_name.h
index 4a0600d..724ae3c 100644
--- a/sync/util/get_session_name.h
+++ b/sync/util/get_session_name.h
@@ -21,7 +21,7 @@ SYNC_EXPORT void GetSessionName(
const scoped_refptr<base::TaskRunner>& task_runner,
const base::Callback<void(const std::string&)>& done_callback);
-std::string GetSessionNameSynchronouslyForTesting();
+SYNC_EXPORT_PRIVATE std::string GetSessionNameSynchronouslyForTesting();
} // namespace syncer
diff --git a/sync/util/time.h b/sync/util/time.h
index 2b0b245..79cb958 100644
--- a/sync/util/time.h
+++ b/sync/util/time.h
@@ -20,7 +20,7 @@ namespace syncer {
SYNC_EXPORT int64 TimeToProtoTime(const base::Time& t);
// Converts a time field from sync protobufs to a time object.
-base::Time ProtoTimeToTime(int64 proto_t);
+SYNC_EXPORT_PRIVATE base::Time ProtoTimeToTime(int64 proto_t);
SYNC_EXPORT std::string GetTimeDebugString(const base::Time& t);