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

Side by Side Diff: chrome/browser/sync/glue/sync_backend_host_core.h

Issue 1275743002: [Sync] Remove backend unrecoverable error handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix leak Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_GLUE_SYNC_BACKEND_HOST_CORE_H_ 5 #ifndef CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_
6 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_ 6 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 9
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 21 matching lines...) Expand all
32 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, 32 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
33 const GURL& service_url, 33 const GURL& service_url,
34 scoped_ptr<syncer::HttpPostProviderFactory> http_bridge_factory, 34 scoped_ptr<syncer::HttpPostProviderFactory> http_bridge_factory,
35 const syncer::SyncCredentials& credentials, 35 const syncer::SyncCredentials& credentials,
36 const std::string& invalidator_client_id, 36 const std::string& invalidator_client_id,
37 scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory, 37 scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory,
38 bool delete_sync_data_folder, 38 bool delete_sync_data_folder,
39 const std::string& restored_key_for_bootstrapping, 39 const std::string& restored_key_for_bootstrapping,
40 const std::string& restored_keystore_key_for_bootstrapping, 40 const std::string& restored_keystore_key_for_bootstrapping,
41 scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory, 41 scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory,
42 scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler, 42 const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
43 unrecoverable_error_handler,
43 const base::Closure& report_unrecoverable_error_function, 44 const base::Closure& report_unrecoverable_error_function,
44 scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state, 45 scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state,
45 syncer::PassphraseTransitionClearDataOption clear_data_option, 46 syncer::PassphraseTransitionClearDataOption clear_data_option,
46 const std::map<syncer::ModelType, int64>& invalidation_versions); 47 const std::map<syncer::ModelType, int64>& invalidation_versions);
47 ~DoInitializeOptions(); 48 ~DoInitializeOptions();
48 49
49 base::MessageLoop* sync_loop; 50 base::MessageLoop* sync_loop;
50 SyncBackendRegistrar* registrar; 51 SyncBackendRegistrar* registrar;
51 syncer::ModelSafeRoutingInfo routing_info; 52 syncer::ModelSafeRoutingInfo routing_info;
52 std::vector<scoped_refptr<syncer::ModelSafeWorker> > workers; 53 std::vector<scoped_refptr<syncer::ModelSafeWorker> > workers;
53 scoped_refptr<syncer::ExtensionsActivity> extensions_activity; 54 scoped_refptr<syncer::ExtensionsActivity> extensions_activity;
54 syncer::WeakHandle<syncer::JsEventHandler> event_handler; 55 syncer::WeakHandle<syncer::JsEventHandler> event_handler;
55 GURL service_url; 56 GURL service_url;
56 // Overridden by tests. 57 // Overridden by tests.
57 scoped_ptr<syncer::HttpPostProviderFactory> http_bridge_factory; 58 scoped_ptr<syncer::HttpPostProviderFactory> http_bridge_factory;
58 syncer::SyncCredentials credentials; 59 syncer::SyncCredentials credentials;
59 const std::string invalidator_client_id; 60 const std::string invalidator_client_id;
60 scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory; 61 scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory;
61 std::string lsid; 62 std::string lsid;
62 bool delete_sync_data_folder; 63 bool delete_sync_data_folder;
63 std::string restored_key_for_bootstrapping; 64 std::string restored_key_for_bootstrapping;
64 std::string restored_keystore_key_for_bootstrapping; 65 std::string restored_keystore_key_for_bootstrapping;
65 scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory; 66 scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory;
66 scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler; 67 const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>
68 unrecoverable_error_handler;
67 base::Closure report_unrecoverable_error_function; 69 base::Closure report_unrecoverable_error_function;
68 scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state; 70 scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state;
69 const syncer::PassphraseTransitionClearDataOption clear_data_option; 71 const syncer::PassphraseTransitionClearDataOption clear_data_option;
70 const std::map<syncer::ModelType, int64> invalidation_versions; 72 const std::map<syncer::ModelType, int64> invalidation_versions;
71 }; 73 };
72 74
73 // Helper struct to handle currying params to 75 // Helper struct to handle currying params to
74 // SyncBackendHost::Core::DoConfigureSyncer. 76 // SyncBackendHost::Core::DoConfigureSyncer.
75 struct DoConfigureSyncerTypes { 77 struct DoConfigureSyncerTypes {
76 DoConfigureSyncerTypes(); 78 DoConfigureSyncerTypes();
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 std::map<syncer::ModelType, int64> last_invalidation_versions_; 321 std::map<syncer::ModelType, int64> last_invalidation_versions_;
320 322
321 base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_; 323 base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_;
322 324
323 DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore); 325 DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore);
324 }; 326 };
325 327
326 } // namespace browser_sync 328 } // namespace browser_sync
327 329
328 #endif // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_ 330 #endif // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host.h ('k') | chrome/browser/sync/glue/sync_backend_host_core.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698