| 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 "chrome/browser/sync/sessions/session_state.h" | 5 #include "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> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/base64.h" | 13 #include "base/base64.h" |
| 14 #include "base/json/json_writer.h" | 14 #include "base/json/json_writer.h" |
| 15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/values.h" | 16 #include "base/values.h" |
| 17 #include "chrome/browser/sync/protocol/proto_enum_conversions.h" | 17 #include "sync/protocol/proto_enum_conversions.h" |
| 18 | 18 |
| 19 using std::set; | 19 using std::set; |
| 20 using std::vector; | 20 using std::vector; |
| 21 | 21 |
| 22 namespace browser_sync { | 22 namespace browser_sync { |
| 23 namespace sessions { | 23 namespace sessions { |
| 24 | 24 |
| 25 SyncSourceInfo::SyncSourceInfo() | 25 SyncSourceInfo::SyncSourceInfo() |
| 26 : updates_source(sync_pb::GetUpdatesCallerInfo::UNKNOWN) {} | 26 : updates_source(sync_pb::GetUpdatesCallerInfo::UNKNOWN) {} |
| 27 | 27 |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 | 315 |
| 316 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) | 316 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag) |
| 317 : conflict_progress(dirty_flag) { | 317 : conflict_progress(dirty_flag) { |
| 318 } | 318 } |
| 319 | 319 |
| 320 PerModelSafeGroupState::~PerModelSafeGroupState() { | 320 PerModelSafeGroupState::~PerModelSafeGroupState() { |
| 321 } | 321 } |
| 322 | 322 |
| 323 } // namespace sessions | 323 } // namespace sessions |
| 324 } // namespace browser_sync | 324 } // namespace browser_sync |
| OLD | NEW |