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

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

Issue 3168009: Added classes to enable session sync functionality.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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
===================================================================
--- chrome/browser/sync/profile_sync_service.cc (revision 56023)
+++ chrome/browser/sync/profile_sync_service.cc (working copy)
@@ -29,6 +29,7 @@
#include "chrome/browser/sync/glue/change_processor.h"
#include "chrome/browser/sync/glue/data_type_controller.h"
#include "chrome/browser/sync/glue/data_type_manager.h"
+#include "chrome/browser/sync/glue/session_data_type_controller.h"
#include "chrome/browser/sync/profile_sync_factory.h"
#include "chrome/browser/sync/syncable/directory_manager.h"
#include "chrome/common/chrome_switches.h"
@@ -169,6 +170,19 @@
data_type_controller;
}
+browser_sync::SessionModelAssociator*
+ ProfileSyncService::GetSessionModelAssociator() {
+ if (data_type_controllers_.find(syncable::SESSIONS) ==
+ data_type_controllers_.end() ||
+ data_type_controllers_.find(syncable::SESSIONS)->second->state() !=
+ DataTypeController::RUNNING) {
+ return NULL;
+ }
+ return static_cast<browser_sync::SessionDataTypeController*>(
+ data_type_controllers_.find(
+ syncable::SESSIONS)->second.get())->GetModelAssociator();
+}
+
void ProfileSyncService::GetDataTypeControllerStates(
browser_sync::DataTypeController::StateMap* state_map) const {
browser_sync::DataTypeController::TypeMap::const_iterator iter
@@ -239,10 +253,9 @@
pref_service->RegisterBooleanPref(prefs::kSyncThemes, enable_by_default);
pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, enable_by_default);
pref_service->RegisterBooleanPref(prefs::kSyncExtensions, enable_by_default);
-
+ pref_service->RegisterBooleanPref(prefs::kSyncSessions, enable_by_default);
pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced,
enable_by_default);
-
pref_service->RegisterBooleanPref(prefs::kSyncManaged, false);
}
@@ -320,8 +333,7 @@
}
void ProfileSyncService::Shutdown(bool sync_disabled) {
-
- // Stop all data type controllers, if needed.
+ // Stop all data type controllers, if needed.
if (data_type_manager_.get() &&
data_type_manager_->state() != DataTypeManager::STOPPED) {
data_type_manager_->Stop();
@@ -406,6 +418,8 @@
return prefs::kSyncTypedUrls;
case syncable::EXTENSIONS:
return prefs::kSyncExtensions;
+ case syncable::SESSIONS:
+ return prefs::kSyncSessions;
default:
NOTREACHED();
return NULL;
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/profile_sync_service_password_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698