Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(976)

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 1310373009: [Sync] Remove static methods on SyncedWindowDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d3251aa830bfa451896697d09e0998d92eded5f6..0de45d8b65a62d59ca08e56ef0c2e8a9488007e9 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/channel_info.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
@@ -105,6 +106,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
@@ -277,9 +279,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()));

Powered by Google App Engine
This is Rietveld 408576698