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

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

Issue 428143002: Sync: Add a SyncTypePreferenceProvider interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <cstddef> 7 #include <cstddef>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <vector>
10 #include <utility>
11 10
12 #include "base/basictypes.h" 11 #include "base/basictypes.h"
13 #include "base/bind.h" 12 #include "base/bind.h"
14 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
15 #include "base/callback.h" 14 #include "base/callback.h"
16 #include "base/command_line.h" 15 #include "base/command_line.h"
17 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
18 #include "base/file_util.h" 17 #include "base/file_util.h"
19 #include "base/logging.h" 18 #include "base/logging.h"
20 #include "base/memory/ref_counted.h" 19 #include "base/memory/ref_counted.h"
(...skipping 27 matching lines...) Expand all
48 #include "chrome/browser/sync/glue/sync_backend_host.h" 47 #include "chrome/browser/sync/glue/sync_backend_host.h"
49 #include "chrome/browser/sync/glue/sync_backend_host_impl.h" 48 #include "chrome/browser/sync/glue/sync_backend_host_impl.h"
50 #include "chrome/browser/sync/glue/sync_start_util.h" 49 #include "chrome/browser/sync/glue/sync_start_util.h"
51 #include "chrome/browser/sync/glue/synced_device_tracker.h" 50 #include "chrome/browser/sync/glue/synced_device_tracker.h"
52 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" 51 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
53 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" 52 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
54 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" 53 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
55 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" 54 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
56 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h" 55 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
57 #include "chrome/browser/sync/sync_error_controller.h" 56 #include "chrome/browser/sync/sync_error_controller.h"
57 #include "chrome/browser/sync/sync_type_preference_provider.h"
58 #include "chrome/browser/ui/browser.h" 58 #include "chrome/browser/ui/browser.h"
59 #include "chrome/browser/ui/browser_list.h" 59 #include "chrome/browser/ui/browser_list.h"
60 #include "chrome/browser/ui/browser_window.h" 60 #include "chrome/browser/ui/browser_window.h"
61 #include "chrome/browser/ui/global_error/global_error_service.h" 61 #include "chrome/browser/ui/global_error/global_error_service.h"
62 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 62 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
63 #include "chrome/common/chrome_switches.h" 63 #include "chrome/common/chrome_switches.h"
64 #include "chrome/common/chrome_version_info.h" 64 #include "chrome/common/chrome_version_info.h"
65 #include "chrome/common/pref_names.h" 65 #include "chrome/common/pref_names.h"
66 #include "chrome/common/url_constants.h" 66 #include "chrome/common/url_constants.h"
67 #include "components/gcm_driver/gcm_driver.h" 67 #include "components/gcm_driver/gcm_driver.h"
(...skipping 1749 matching lines...) Expand 10 before | Expand all | Expand 10 after
1817 sync_prefs_.GetPreferredDataTypes(registered_types); 1817 sync_prefs_.GetPreferredDataTypes(registered_types);
1818 return preferred_types; 1818 return preferred_types;
1819 } 1819 }
1820 1820
1821 syncer::ModelTypeSet 1821 syncer::ModelTypeSet
1822 ProfileSyncService::GetPreferredDirectoryDataTypes() const { 1822 ProfileSyncService::GetPreferredDirectoryDataTypes() const {
1823 const syncer::ModelTypeSet registered_directory_types = 1823 const syncer::ModelTypeSet registered_directory_types =
1824 GetRegisteredDirectoryDataTypes(); 1824 GetRegisteredDirectoryDataTypes();
1825 const syncer::ModelTypeSet preferred_types = 1825 const syncer::ModelTypeSet preferred_types =
1826 sync_prefs_.GetPreferredDataTypes(registered_directory_types); 1826 sync_prefs_.GetPreferredDataTypes(registered_directory_types);
1827 return preferred_types; 1827
1828 return Union(preferred_types, GetDataTypesFromPreferenceProviders());
1828 } 1829 }
1829 1830
1830 syncer::ModelTypeSet 1831 syncer::ModelTypeSet
1831 ProfileSyncService::GetPreferredNonBlockingDataTypes() const { 1832 ProfileSyncService::GetPreferredNonBlockingDataTypes() const {
1832 return sync_prefs_.GetPreferredDataTypes(GetRegisteredNonBlockingDataTypes()); 1833 return sync_prefs_.GetPreferredDataTypes(GetRegisteredNonBlockingDataTypes());
1833 } 1834 }
1834 1835
1835 syncer::ModelTypeSet ProfileSyncService::GetRegisteredDataTypes() const { 1836 syncer::ModelTypeSet ProfileSyncService::GetRegisteredDataTypes() const {
1836 return Union(GetRegisteredDirectoryDataTypes(), 1837 return Union(GetRegisteredDirectoryDataTypes(),
1837 GetRegisteredNonBlockingDataTypes()); 1838 GetRegisteredNonBlockingDataTypes());
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
2273 2274
2274 void ProfileSyncService::RemoveTypeDebugInfoObserver( 2275 void ProfileSyncService::RemoveTypeDebugInfoObserver(
2275 syncer::TypeDebugInfoObserver* type_debug_info_observer) { 2276 syncer::TypeDebugInfoObserver* type_debug_info_observer) {
2276 type_debug_info_observers_.RemoveObserver(type_debug_info_observer); 2277 type_debug_info_observers_.RemoveObserver(type_debug_info_observer);
2277 if (!type_debug_info_observers_.might_have_observers() && 2278 if (!type_debug_info_observers_.might_have_observers() &&
2278 backend_initialized_) { 2279 backend_initialized_) {
2279 backend_->DisableDirectoryTypeDebugInfoForwarding(); 2280 backend_->DisableDirectoryTypeDebugInfoForwarding();
2280 } 2281 }
2281 } 2282 }
2282 2283
2284 void ProfileSyncService::AddPreferenceProvider(
2285 SyncTypePreferenceProvider* provider) {
2286 DCHECK(!HasPreferenceProvider(provider))
2287 << "Providers may only be added once!";
2288 preference_providers_.insert(provider);
2289 }
2290
2291 void ProfileSyncService::RemovePreferenceProvider(
2292 SyncTypePreferenceProvider* provider) {
2293 DCHECK(HasPreferenceProvider(provider))
2294 << "Only providers that have been added before can be removed!";
2295 preference_providers_.erase(provider);
2296 }
2297
2298 bool ProfileSyncService::HasPreferenceProvider(
2299 SyncTypePreferenceProvider* provider) const {
2300 return preference_providers_.count(provider) > 0;
2301 }
2302
2283 namespace { 2303 namespace {
2284 2304
2285 class GetAllNodesRequestHelper 2305 class GetAllNodesRequestHelper
2286 : public base::RefCountedThreadSafe<GetAllNodesRequestHelper> { 2306 : public base::RefCountedThreadSafe<GetAllNodesRequestHelper> {
2287 public: 2307 public:
2288 GetAllNodesRequestHelper( 2308 GetAllNodesRequestHelper(
2289 syncer::ModelTypeSet requested_types, 2309 syncer::ModelTypeSet requested_types,
2290 const base::Callback<void(scoped_ptr<base::ListValue>)>& callback); 2310 const base::Callback<void(scoped_ptr<base::ListValue>)>& callback);
2291 2311
2292 void OnReceivedNodesForTypes( 2312 void OnReceivedNodesForTypes(
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
2461 NotifyObservers(); 2481 NotifyObservers();
2462 2482
2463 DVLOG(1) << "ConfigureDataTypeManager not invoked because of an " 2483 DVLOG(1) << "ConfigureDataTypeManager not invoked because of an "
2464 << "Unrecoverable error."; 2484 << "Unrecoverable error.";
2465 } else { 2485 } else {
2466 DVLOG(0) << "ConfigureDataTypeManager not invoked because backend is not " 2486 DVLOG(0) << "ConfigureDataTypeManager not invoked because backend is not "
2467 << "initialized"; 2487 << "initialized";
2468 } 2488 }
2469 } 2489 }
2470 2490
2491 syncer::ModelTypeSet ProfileSyncService::GetDataTypesFromPreferenceProviders()
2492 const {
2493 syncer::ModelTypeSet types;
2494 for (std::set<SyncTypePreferenceProvider*>::const_iterator it =
2495 preference_providers_.begin();
2496 it != preference_providers_.end();
2497 ++it) {
2498 types.PutAll((*it)->GetPreferredDataTypes());
2499 }
2500 return types;
2501 }
2502
2471 const FailedDataTypesHandler& ProfileSyncService::failed_data_types_handler() 2503 const FailedDataTypesHandler& ProfileSyncService::failed_data_types_handler()
2472 const { 2504 const {
2473 return failed_data_types_handler_; 2505 return failed_data_types_handler_;
2474 } 2506 }
2475 2507
2476 void ProfileSyncService::OnInternalUnrecoverableError( 2508 void ProfileSyncService::OnInternalUnrecoverableError(
2477 const tracked_objects::Location& from_here, 2509 const tracked_objects::Location& from_here,
2478 const std::string& message, 2510 const std::string& message,
2479 bool delete_sync_database, 2511 bool delete_sync_database,
2480 UnrecoverableErrorReason reason) { 2512 UnrecoverableErrorReason reason) {
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2647 browser_sync::SyncedDeviceTracker* device_tracker = 2679 browser_sync::SyncedDeviceTracker* device_tracker =
2648 backend_->GetSyncedDeviceTracker(); 2680 backend_->GetSyncedDeviceTracker();
2649 if (device_tracker) 2681 if (device_tracker)
2650 device_tracker->UpdateLocalDeviceBackupTime(*last_backup_time_); 2682 device_tracker->UpdateLocalDeviceBackupTime(*last_backup_time_);
2651 } 2683 }
2652 } 2684 }
2653 2685
2654 base::Time ProfileSyncService::GetDeviceBackupTimeForTesting() const { 2686 base::Time ProfileSyncService::GetDeviceBackupTimeForTesting() const {
2655 return backend_->GetSyncedDeviceTracker()->GetLocalDeviceBackupTime(); 2687 return backend_->GetSyncedDeviceTracker()->GetLocalDeviceBackupTime();
2656 } 2688 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/sync_type_preference_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698