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

Side by Side Diff: sync/internal_api/sync_rollback_manager_base.h

Issue 268163002: Let sync backup/rollback manager return a dummy encryption handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | sync/internal_api/sync_rollback_manager_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 SYNC_INTERNAL_API_SYNC_ROLLBACK_MANAGER_BASE_H_ 5 #ifndef SYNC_INTERNAL_API_SYNC_ROLLBACK_MANAGER_BASE_H_
6 #define SYNC_INTERNAL_API_SYNC_ROLLBACK_MANAGER_BASE_H_ 6 #define SYNC_INTERNAL_API_SYNC_ROLLBACK_MANAGER_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 void InitBookmarkFolder(const std::string& folder); 125 void InitBookmarkFolder(const std::string& folder);
126 126
127 UserShare share_; 127 UserShare share_;
128 ObserverList<SyncManager::Observer> observers_; 128 ObserverList<SyncManager::Observer> observers_;
129 129
130 scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler_; 130 scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler_;
131 ReportUnrecoverableErrorFunction report_unrecoverable_error_function_; 131 ReportUnrecoverableErrorFunction report_unrecoverable_error_function_;
132 132
133 base::WeakPtrFactory<SyncRollbackManagerBase> weak_ptr_factory_; 133 base::WeakPtrFactory<SyncRollbackManagerBase> weak_ptr_factory_;
134 134
135 scoped_ptr<SyncEncryptionHandler> dummy_handler_;
136
135 DISALLOW_COPY_AND_ASSIGN(SyncRollbackManagerBase); 137 DISALLOW_COPY_AND_ASSIGN(SyncRollbackManagerBase);
136 }; 138 };
137 139
138 } // namespace syncer 140 } // namespace syncer
139 141
140 #endif // SYNC_INTERNAL_API_SYNC_ROLLBACK_MANAGER_BASE_H_ 142 #endif // SYNC_INTERNAL_API_SYNC_ROLLBACK_MANAGER_BASE_H_
OLDNEW
« no previous file with comments | « no previous file | sync/internal_api/sync_rollback_manager_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698