OLD | NEW |
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 "sync/sessions/sync_session.h" | 5 #include "sync/sessions/sync_session.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "sync/syncable/model_type.h" | 10 #include "sync/syncable/model_type.h" |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 download_progress_markers, | 158 download_progress_markers, |
159 HasMoreToSync(), | 159 HasMoreToSync(), |
160 delegate_->IsSyncingCurrentlySilenced(), | 160 delegate_->IsSyncingCurrentlySilenced(), |
161 status_controller_->unsynced_handles().size(), | 161 status_controller_->unsynced_handles().size(), |
162 status_controller_->TotalNumEncryptionConflictingItems(), | 162 status_controller_->TotalNumEncryptionConflictingItems(), |
163 status_controller_->TotalNumHierarchyConflictingItems(), | 163 status_controller_->TotalNumHierarchyConflictingItems(), |
164 status_controller_->TotalNumSimpleConflictingItems(), | 164 status_controller_->TotalNumSimpleConflictingItems(), |
165 status_controller_->TotalNumServerConflictingItems(), | 165 status_controller_->TotalNumServerConflictingItems(), |
166 status_controller_->did_commit_items(), | 166 status_controller_->did_commit_items(), |
167 source_, | 167 source_, |
| 168 context_->notifications_enabled(), |
168 dir->GetEntriesCount(), | 169 dir->GetEntriesCount(), |
169 status_controller_->sync_start_time(), | 170 status_controller_->sync_start_time(), |
170 !Succeeded()); | 171 !Succeeded()); |
171 } | 172 } |
172 | 173 |
173 void SyncSession::SendEventNotification(SyncEngineEvent::EventCause cause) { | 174 void SyncSession::SendEventNotification(SyncEngineEvent::EventCause cause) { |
174 SyncEngineEvent event(cause); | 175 SyncEngineEvent event(cause); |
175 const SyncSessionSnapshot& snapshot = TakeSnapshot(); | 176 const SyncSessionSnapshot& snapshot = TakeSnapshot(); |
176 event.snapshot = &snapshot; | 177 event.snapshot = &snapshot; |
177 | 178 |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 IsError(status_controller_->error().last_post_commit_result); | 245 IsError(status_controller_->error().last_post_commit_result); |
245 const bool process_commit_response_error = | 246 const bool process_commit_response_error = |
246 IsError(status_controller_->error().last_process_commit_response_result); | 247 IsError(status_controller_->error().last_process_commit_response_result); |
247 return !download_updates_error | 248 return !download_updates_error |
248 && !post_commit_error | 249 && !post_commit_error |
249 && !process_commit_response_error; | 250 && !process_commit_response_error; |
250 } | 251 } |
251 | 252 |
252 } // namespace sessions | 253 } // namespace sessions |
253 } // namespace browser_sync | 254 } // namespace browser_sync |
OLD | NEW |