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

Unified Diff: components/sync_sessions/session_data_type_controller.cc

Issue 2511703004: [Sync] Remove UIDataTypeController (Closed)
Patch Set: . Created 4 years, 1 month 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: components/sync_sessions/session_data_type_controller.cc
diff --git a/components/sync_sessions/session_data_type_controller.cc b/components/sync_sessions/session_data_type_controller.cc
index ec144668b0729f7548055039945305e8405998c9..6199758e75cabba67e0059fa85ce7167dc0c79da 100644
--- a/components/sync_sessions/session_data_type_controller.cc
+++ b/components/sync_sessions/session_data_type_controller.cc
@@ -6,6 +6,7 @@
#include <set>
+#include "base/threading/thread_task_runner_handle.h"
#include "components/prefs/pref_service.h"
#include "components/sync/driver/sync_client.h"
#include "components/sync_sessions/sync_sessions_client.h"
@@ -19,7 +20,11 @@ SessionDataTypeController::SessionDataTypeController(
syncer::SyncClient* sync_client,
syncer::LocalDeviceInfoProvider* local_device,
const char* history_disabled_pref_name)
- : UIDataTypeController(syncer::SESSIONS, dump_stack, sync_client),
+ : NonUIDataTypeController(syncer::SESSIONS,
+ dump_stack,
+ sync_client,
+ syncer::GROUP_UI,
+ base::ThreadTaskRunnerHandle::Get()),
sync_client_(sync_client),
local_device_(local_device),
history_disabled_pref_name_(history_disabled_pref_name),
@@ -81,7 +86,7 @@ bool SessionDataTypeController::IsWaiting() {
}
void SessionDataTypeController::MaybeCompleteLoading() {
- if (state_ == MODEL_STARTING && !IsWaiting()) {
+ if (state() == MODEL_STARTING && !IsWaiting()) {
OnModelLoaded();
}
}

Powered by Google App Engine
This is Rietveld 408576698