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

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

Issue 513543004: [Sync] Rename FailedDataTypesHandler -> DataTypeStatusTable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 6 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 unified diff | Download patch
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 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/sync/profile_sync_service_observer.h" 30 #include "chrome/browser/sync/profile_sync_service_observer.h"
31 #include "chrome/browser/sync/protocol_event_observer.h" 31 #include "chrome/browser/sync/protocol_event_observer.h"
32 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" 32 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
33 #include "chrome/browser/sync/startup_controller.h" 33 #include "chrome/browser/sync/startup_controller.h"
34 #include "components/keyed_service/core/keyed_service.h" 34 #include "components/keyed_service/core/keyed_service.h"
35 #include "components/signin/core/browser/signin_manager_base.h" 35 #include "components/signin/core/browser/signin_manager_base.h"
36 #include "components/sync_driver/data_type_controller.h" 36 #include "components/sync_driver/data_type_controller.h"
37 #include "components/sync_driver/data_type_encryption_handler.h" 37 #include "components/sync_driver/data_type_encryption_handler.h"
38 #include "components/sync_driver/data_type_manager.h" 38 #include "components/sync_driver/data_type_manager.h"
39 #include "components/sync_driver/data_type_manager_observer.h" 39 #include "components/sync_driver/data_type_manager_observer.h"
40 #include "components/sync_driver/failed_data_types_handler.h" 40 #include "components/sync_driver/data_type_status_table.h"
41 #include "components/sync_driver/non_blocking_data_type_manager.h" 41 #include "components/sync_driver/non_blocking_data_type_manager.h"
42 #include "components/sync_driver/sync_frontend.h" 42 #include "components/sync_driver/sync_frontend.h"
43 #include "components/sync_driver/sync_prefs.h" 43 #include "components/sync_driver/sync_prefs.h"
44 #include "google_apis/gaia/google_service_auth_error.h" 44 #include "google_apis/gaia/google_service_auth_error.h"
45 #include "google_apis/gaia/oauth2_token_service.h" 45 #include "google_apis/gaia/oauth2_token_service.h"
46 #include "net/base/backoff_entry.h" 46 #include "net/base/backoff_entry.h"
47 #include "sync/internal_api/public/base/model_type.h" 47 #include "sync/internal_api/public/base/model_type.h"
48 #include "sync/internal_api/public/engine/model_safe_worker.h" 48 #include "sync/internal_api/public/engine/model_safe_worker.h"
49 #include "sync/internal_api/public/shutdown_reason.h" 49 #include "sync/internal_api/public/shutdown_reason.h"
50 #include "sync/internal_api/public/sync_manager_factory.h" 50 #include "sync/internal_api/public/sync_manager_factory.h"
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 713
714 // Marks all currently registered types as "acknowledged" so we won't prompt 714 // Marks all currently registered types as "acknowledged" so we won't prompt
715 // the user about them any more. 715 // the user about them any more.
716 void AcknowledgeSyncedTypes(); 716 void AcknowledgeSyncedTypes();
717 717
718 SyncErrorController* sync_error_controller() { 718 SyncErrorController* sync_error_controller() {
719 return sync_error_controller_.get(); 719 return sync_error_controller_.get();
720 } 720 }
721 721
722 // TODO(sync): This is only used in tests. Can we remove it? 722 // TODO(sync): This is only used in tests. Can we remove it?
723 const sync_driver::FailedDataTypesHandler& failed_data_types_handler() const; 723 const sync_driver::DataTypeStatusTable& data_type_status_table() const;
724 724
725 sync_driver::DataTypeManager::ConfigureStatus configure_status() { 725 sync_driver::DataTypeManager::ConfigureStatus configure_status() {
726 return configure_status_; 726 return configure_status_;
727 } 727 }
728 728
729 // If true, the ProfileSyncService has detected that a new GAIA signin has 729 // If true, the ProfileSyncService has detected that a new GAIA signin has
730 // succeeded, and is waiting for initialization to complete. This is used by 730 // succeeded, and is waiting for initialization to complete. This is used by
731 // the UI to differentiate between a new auth error (encountered as part of 731 // the UI to differentiate between a new auth error (encountered as part of
732 // the initialization process) and a pre-existing auth error that just hasn't 732 // the initialization process) and a pre-existing auth error that just hasn't
733 // been cleared yet. Virtual for testing purposes. 733 // been cleared yet. Virtual for testing purposes.
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 1073
1074 // This is the last |SyncProtocolError| we received from the server that had 1074 // This is the last |SyncProtocolError| we received from the server that had
1075 // an action set on it. 1075 // an action set on it.
1076 syncer::SyncProtocolError last_actionable_error_; 1076 syncer::SyncProtocolError last_actionable_error_;
1077 1077
1078 // Exposes sync errors to the UI. 1078 // Exposes sync errors to the UI.
1079 scoped_ptr<SyncErrorController> sync_error_controller_; 1079 scoped_ptr<SyncErrorController> sync_error_controller_;
1080 1080
1081 // Tracks the set of failed data types (those that encounter an error 1081 // Tracks the set of failed data types (those that encounter an error
1082 // or must delay loading for some reason). 1082 // or must delay loading for some reason).
1083 sync_driver::FailedDataTypesHandler failed_data_types_handler_; 1083 sync_driver::DataTypeStatusTable data_type_status_table_;
1084 1084
1085 sync_driver::DataTypeManager::ConfigureStatus configure_status_; 1085 sync_driver::DataTypeManager::ConfigureStatus configure_status_;
1086 1086
1087 // The set of currently enabled sync experiments. 1087 // The set of currently enabled sync experiments.
1088 syncer::Experiments current_experiments_; 1088 syncer::Experiments current_experiments_;
1089 1089
1090 // Sync's internal debug info listener. Used to record datatype configuration 1090 // Sync's internal debug info listener. Used to record datatype configuration
1091 // and association information. 1091 // and association information.
1092 syncer::WeakHandle<syncer::DataTypeDebugInfoListener> debug_info_listener_; 1092 syncer::WeakHandle<syncer::DataTypeDebugInfoListener> debug_info_listener_;
1093 1093
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 BrowsingDataRemover::Observer* browsing_data_remover_observer_; 1165 BrowsingDataRemover::Observer* browsing_data_remover_observer_;
1166 1166
1167 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 1167 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
1168 }; 1168 };
1169 1169
1170 bool ShouldShowActionOnUI( 1170 bool ShouldShowActionOnUI(
1171 const syncer::SyncProtocolError& error); 1171 const syncer::SyncProtocolError& error);
1172 1172
1173 1173
1174 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 1174 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_mock.h ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698