| 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/session_state.h" | 5 #include "chrome/browser/sync/sessions/session_state.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 if (it->first == CONFLICT) { | 375 if (it->first == CONFLICT) { |
| 376 return true; | 376 return true; |
| 377 } | 377 } |
| 378 } | 378 } |
| 379 return false; | 379 return false; |
| 380 } | 380 } |
| 381 | 381 |
| 382 AllModelTypeState::AllModelTypeState(bool* dirty_flag) | 382 AllModelTypeState::AllModelTypeState(bool* dirty_flag) |
| 383 : unsynced_handles(dirty_flag), | 383 : unsynced_handles(dirty_flag), |
| 384 syncer_status(dirty_flag), | 384 syncer_status(dirty_flag), |
| 385 error_counters(dirty_flag), | 385 error(dirty_flag), |
| 386 num_server_changes_remaining(dirty_flag, 0), | 386 num_server_changes_remaining(dirty_flag, 0), |
| 387 commit_set(ModelSafeRoutingInfo()) { | 387 commit_set(ModelSafeRoutingInfo()) { |
| 388 } | 388 } |
| 389 | 389 |
| 390 AllModelTypeState::~AllModelTypeState() {} | 390 AllModelTypeState::~AllModelTypeState() {} |
| 391 | 391 |
| 392 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) | 392 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) |
| 393 : conflict_progress(dirty_flag) { | 393 : conflict_progress(dirty_flag) { |
| 394 } | 394 } |
| 395 | 395 |
| 396 PerModelSafeGroupState::~PerModelSafeGroupState() { | 396 PerModelSafeGroupState::~PerModelSafeGroupState() { |
| 397 } | 397 } |
| 398 | 398 |
| 399 } // namespace sessions | 399 } // namespace sessions |
| 400 } // namespace browser_sync | 400 } // namespace browser_sync |
| OLD | NEW |