| Index: chrome/browser/sync/profile_sync_service.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
|
| index ad0baba4fb592d121b6140a8872af2a8b926e6fc..4e5a000184816d9e5a7df720b49056b15dcca042 100644
|
| --- a/chrome/browser/sync/profile_sync_service.cc
|
| +++ b/chrome/browser/sync/profile_sync_service.cc
|
| @@ -52,6 +52,7 @@
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/global_error/global_error_service.h"
|
| #include "chrome/browser/ui/global_error/global_error_service_factory.h"
|
| +#include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/sync_util.h"
|
| @@ -103,6 +104,7 @@
|
| #include "ui/base/l10n/time_format.h"
|
|
|
| #if defined(OS_ANDROID)
|
| +#include "chrome/browser/sync/glue/synced_window_delegates_getter_android.h"
|
| #include "sync/internal_api/public/read_transaction.h"
|
| #endif
|
|
|
| @@ -274,9 +276,16 @@ ProfileSyncService::ProfileSyncService(
|
| sync_service_url_,
|
| local_device_->GetSyncUserAgent(),
|
| profile_->GetRequestContext(),
|
| - browser_sync::SyncStoppedReporter::ResultCallback())),
|
| + browser_sync::SyncStoppedReporter::ResultCallback()));
|
| + scoped_ptr<browser_sync::SyncedWindowDelegatesGetter> synced_window_getter(
|
| +#if defined(OS_ANDROID)
|
| + new browser_sync::SyncedWindowDelegatesGetterAndroid());
|
| +#else
|
| + new browser_sync::BrowserSyncedWindowDelegatesGetter());
|
| +#endif
|
| sessions_sync_manager_.reset(
|
| - new SessionsSyncManager(profile, local_device_.get(), router.Pass()));
|
| + new SessionsSyncManager(profile, local_device_.get(), router.Pass(),
|
| + synced_window_getter.Pass()));
|
| device_info_sync_service_.reset(
|
| new DeviceInfoSyncService(local_device_.get()));
|
|
|
|
|