OLD | NEW |
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/sessions/sync_session_context.h" | 5 #include "chrome/browser/sync/sessions/sync_session_context.h" |
6 | 6 |
7 #include "chrome/browser/sync/util/extensions_activity_monitor.h" | 7 #include "chrome/browser/sync/util/extensions_activity_monitor.h" |
| 8 #include "chrome/browser/sync/sessions/debug_info_getter.h" |
8 #include "chrome/browser/sync/sessions/session_state.h" | 9 #include "chrome/browser/sync/sessions/session_state.h" |
9 #include "content/browser/browser_thread.h" | 10 #include "content/browser/browser_thread.h" |
10 | 11 |
11 namespace browser_sync { | 12 namespace browser_sync { |
12 namespace sessions { | 13 namespace sessions { |
13 | 14 |
14 SyncSessionContext::SyncSessionContext( | 15 SyncSessionContext::SyncSessionContext( |
15 ServerConnectionManager* connection_manager, | 16 ServerConnectionManager* connection_manager, |
16 syncable::DirectoryManager* directory_manager, | 17 syncable::DirectoryManager* directory_manager, |
17 ModelSafeWorkerRegistrar* model_safe_worker_registrar, | 18 ModelSafeWorkerRegistrar* model_safe_worker_registrar, |
18 const std::vector<SyncEngineEventListener*>& listeners) | 19 const std::vector<SyncEngineEventListener*>& listeners, |
| 20 DebugInfoGetter* debug_info_getter) |
19 : resolver_(NULL), | 21 : resolver_(NULL), |
20 connection_manager_(connection_manager), | 22 connection_manager_(connection_manager), |
21 directory_manager_(directory_manager), | 23 directory_manager_(directory_manager), |
22 registrar_(model_safe_worker_registrar), | 24 registrar_(model_safe_worker_registrar), |
23 extensions_activity_monitor_(new ExtensionsActivityMonitor()), | 25 extensions_activity_monitor_(new ExtensionsActivityMonitor()), |
24 notifications_enabled_(false), | 26 notifications_enabled_(false), |
25 max_commit_batch_size_(kDefaultMaxCommitBatchSize) { | 27 max_commit_batch_size_(kDefaultMaxCommitBatchSize), |
| 28 debug_info_getter_(debug_info_getter) { |
26 std::vector<SyncEngineEventListener*>::const_iterator it; | 29 std::vector<SyncEngineEventListener*>::const_iterator it; |
27 for (it = listeners.begin(); it != listeners.end(); ++it) | 30 for (it = listeners.begin(); it != listeners.end(); ++it) |
28 listeners_.AddObserver(*it); | 31 listeners_.AddObserver(*it); |
29 } | 32 } |
30 | 33 |
31 SyncSessionContext::~SyncSessionContext() { | 34 SyncSessionContext::~SyncSessionContext() { |
32 // In unittests, there may be no UI thread, so the above will fail. | 35 // In unittests, there may be no UI thread, so the above will fail. |
33 if (!BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, | 36 if (!BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, |
34 extensions_activity_monitor_)) { | 37 extensions_activity_monitor_)) { |
35 delete extensions_activity_monitor_; | 38 delete extensions_activity_monitor_; |
36 } | 39 } |
37 } | 40 } |
38 | 41 |
39 } // namespace sessions | 42 } // namespace sessions |
40 } // namespace browser_sync | 43 } // namespace browser_sync |
OLD | NEW |