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

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 7669073: [Sync] Add support for enabling session sync remotely. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <map> 8 #include <map>
9 #include <ostream>
10 #include <set> 9 #include <set>
11 #include <utility> 10 #include <utility>
12 11
13 #include "base/basictypes.h" 12 #include "base/basictypes.h"
14 #include "base/command_line.h" 13 #include "base/command_line.h"
15 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
16 #include "base/logging.h" 15 #include "base/logging.h"
17 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
18 #include "base/message_loop.h" 17 #include "base/message_loop.h"
19 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 PrefService::UNSYNCABLE_PREF); 307 PrefService::UNSYNCABLE_PREF);
309 pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced, 308 pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced,
310 enable_by_default, 309 enable_by_default,
311 PrefService::UNSYNCABLE_PREF); 310 PrefService::UNSYNCABLE_PREF);
312 pref_service->RegisterBooleanPref(prefs::kSyncManaged, 311 pref_service->RegisterBooleanPref(prefs::kSyncManaged,
313 false, 312 false,
314 PrefService::UNSYNCABLE_PREF); 313 PrefService::UNSYNCABLE_PREF);
315 pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken, 314 pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken,
316 "", 315 "",
317 PrefService::UNSYNCABLE_PREF); 316 PrefService::UNSYNCABLE_PREF);
318
319 pref_service->RegisterBooleanPref(prefs::kSyncAutofillProfile, 317 pref_service->RegisterBooleanPref(prefs::kSyncAutofillProfile,
320 enable_by_default, 318 enable_by_default,
321 PrefService::UNSYNCABLE_PREF); 319 PrefService::UNSYNCABLE_PREF);
322 320
323 // We started prompting people about new data types starting with the 321 // We started prompting people about new data types starting with the
324 // rollout of TYPED_URLs - all previously launched data types are treated 322 // rollout of TYPED_URLs - all previously launched data types are treated
325 // as if they are already acknowledged. 323 // as if they are already acknowledged.
326 syncable::ModelTypeBitSet model_set; 324 syncable::ModelTypeBitSet model_set;
327 model_set.set(syncable::BOOKMARKS); 325 model_set.set(syncable::BOOKMARKS);
328 model_set.set(syncable::PREFERENCES); 326 model_set.set(syncable::PREFERENCES);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 GetPreferredDataTypes(&initial_types); 372 GetPreferredDataTypes(&initial_types);
375 } 373 }
376 374
377 SyncCredentials credentials = GetCredentials(); 375 SyncCredentials credentials = GetCredentials();
378 376
379 scoped_refptr<net::URLRequestContextGetter> request_context_getter( 377 scoped_refptr<net::URLRequestContextGetter> request_context_getter(
380 profile_->GetRequestContext()); 378 profile_->GetRequestContext());
381 379
382 backend_->Initialize( 380 backend_->Initialize(
383 this, 381 this,
382 factory_,
384 WeakHandle<JsEventHandler>(sync_js_controller_.AsWeakPtr()), 383 WeakHandle<JsEventHandler>(sync_js_controller_.AsWeakPtr()),
385 sync_service_url_, 384 sync_service_url_,
386 initial_types, 385 initial_types,
387 credentials, 386 credentials,
388 delete_sync_data_folder); 387 delete_sync_data_folder);
389 } 388 }
390 389
391 void ProfileSyncService::CreateBackend() { 390 void ProfileSyncService::CreateBackend() {
392 backend_.reset(new SyncBackendHost(profile_)); 391 backend_.reset(new SyncBackendHost(profile_));
393 } 392 }
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 // knows what it's doing. 1098 // knows what it's doing.
1100 return backend_.get(); 1099 return backend_.get();
1101 } 1100 }
1102 1101
1103 void ProfileSyncService::ConfigureDataTypeManager() { 1102 void ProfileSyncService::ConfigureDataTypeManager() {
1104 bool restart = false; 1103 bool restart = false;
1105 if (!data_type_manager_.get()) { 1104 if (!data_type_manager_.get()) {
1106 restart = true; 1105 restart = true;
1107 data_type_manager_.reset( 1106 data_type_manager_.reset(
1108 factory_->CreateDataTypeManager(backend_.get(), 1107 factory_->CreateDataTypeManager(backend_.get(),
1109 data_type_controllers_)); 1108 &data_type_controllers_));
1110 registrar_.Add(this, 1109 registrar_.Add(this,
1111 chrome::NOTIFICATION_SYNC_CONFIGURE_START, 1110 chrome::NOTIFICATION_SYNC_CONFIGURE_START,
1112 Source<DataTypeManager>(data_type_manager_.get())); 1111 Source<DataTypeManager>(data_type_manager_.get()));
1113 registrar_.Add(this, 1112 registrar_.Add(this,
1114 chrome::NOTIFICATION_SYNC_CONFIGURE_DONE, 1113 chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
1115 Source<DataTypeManager>(data_type_manager_.get())); 1114 Source<DataTypeManager>(data_type_manager_.get()));
1116 1115
1117 // We create the migrator at the same time. 1116 // We create the migrator at the same time.
1118 migrator_.reset( 1117 migrator_.reset(
1119 new browser_sync::BackendMigrator(this, data_type_manager_.get())); 1118 new browser_sync::BackendMigrator(this, data_type_manager_.get()));
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); 1460 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes));
1462 syncable::ModelTypeSet registered; 1461 syncable::ModelTypeSet registered;
1463 GetRegisteredDataTypes(&registered); 1462 GetRegisteredDataTypes(&registered);
1464 syncable::ModelTypeBitSet registered_bit_set = 1463 syncable::ModelTypeBitSet registered_bit_set =
1465 syncable::ModelTypeBitSetFromSet(registered); 1464 syncable::ModelTypeBitSetFromSet(registered);
1466 unacknowledged = registered_bit_set & ~acknowledged; 1465 unacknowledged = registered_bit_set & ~acknowledged;
1467 } 1466 }
1468 return unacknowledged; 1467 return unacknowledged;
1469 } 1468 }
1470 1469
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698