| Index: sync/api/sync_merge_result.h
|
| diff --git a/sync/api/sync_merge_result.h b/sync/api/sync_merge_result.h
|
| index baa4eb47aac5220b7854a99fc9d4a9f4ad6c0f60..4ffd474fa14ddf6d5de138f0c5e9df68770f81d0 100644
|
| --- a/sync/api/sync_merge_result.h
|
| +++ b/sync/api/sync_merge_result.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.
|
|
|
| @@ -6,6 +6,7 @@
|
| #define SYNC_API_SYNC_MERGE_RESULT_H_
|
|
|
| #include "sync/api/sync_error.h"
|
| +#include "sync/base/sync_export.h"
|
| #include "sync/internal_api/public/base/model_type.h"
|
|
|
| namespace syncer {
|
| @@ -17,7 +18,7 @@ namespace syncer {
|
| // by the local SyncableService, all values correspond to the local state before
|
| // and after merging, and the delta's applied to that state. Sync's change
|
| // processor will create a separate merge result.
|
| -class SyncMergeResult {
|
| +class SYNC_EXPORT SyncMergeResult {
|
| public:
|
| // Initialize an empty merge result for model type |type|.
|
| explicit SyncMergeResult(ModelType type);
|
|
|