summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 20:06:15 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 20:06:15 +0000
commite7ef7150c893a1ff2fe4197ce9d76ccb21001caa (patch)
tree639aa7b62035bbe557dff59d2c43c7a635d0f15c /chrome/browser/sync
parentcc4ba248e6714e6cf29bfa956d415977d78db246 (diff)
downloadchromium_src-e7ef7150c893a1ff2fe4197ce9d76ccb21001caa.zip
chromium_src-e7ef7150c893a1ff2fe4197ce9d76ccb21001caa.tar.gz
chromium_src-e7ef7150c893a1ff2fe4197ce9d76ccb21001caa.tar.bz2
Add the sync files to chrome.gyp. They still don't result in anything building because
the files are wrapped in #ifdef CHROME_PERSONALIZATION which is not defined anywhere at the moment. Add live_sync to chrome\test and corresponding target to chrome.gyp Review URL: http://codereview.chromium.org/159902 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/glue/bookmark_model_worker.cc2
-rw-r--r--chrome/browser/sync/glue/bookmark_model_worker_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/glue/bookmark_model_worker.cc b/chrome/browser/sync/glue/bookmark_model_worker.cc
index 49fba9a..b2a4589 100644
--- a/chrome/browser/sync/glue/bookmark_model_worker.cc
+++ b/chrome/browser/sync/glue/bookmark_model_worker.cc
@@ -111,4 +111,4 @@ void BookmarkModelWorker::CallDoWorkAndSignalTask::Run() {
} // namespace browser_sync
-#endif // CHROME_PERSONALIZATION \ No newline at end of file
+#endif // CHROME_PERSONALIZATION
diff --git a/chrome/browser/sync/glue/bookmark_model_worker_unittest.cc b/chrome/browser/sync/glue/bookmark_model_worker_unittest.cc
index 5ef5b5ea6..879948f 100644
--- a/chrome/browser/sync/glue/bookmark_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/bookmark_model_worker_unittest.cc
@@ -221,4 +221,4 @@ TEST_F(BookmarkModelWorkerTest, HypotheticalManualPumpFlooding) {
core_thread()->Stop();
}
-#endif // CHROME_PERSONALIZATION \ No newline at end of file
+#endif // CHROME_PERSONALIZATION