| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/glue/session_model_associator.h" | 5 #include "chrome/browser/sync/glue/session_model_associator.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "chrome/common/url_constants.h" | 31 #include "chrome/common/url_constants.h" |
| 32 #include "components/sessions/serialized_navigation_entry.h" | 32 #include "components/sessions/serialized_navigation_entry.h" |
| 33 #include "components/user_prefs/pref_registry_syncable.h" | 33 #include "components/user_prefs/pref_registry_syncable.h" |
| 34 #include "content/public/browser/favicon_status.h" | 34 #include "content/public/browser/favicon_status.h" |
| 35 #include "content/public/browser/navigation_entry.h" | 35 #include "content/public/browser/navigation_entry.h" |
| 36 #include "content/public/browser/notification_details.h" | 36 #include "content/public/browser/notification_details.h" |
| 37 #include "content/public/browser/notification_service.h" | 37 #include "content/public/browser/notification_service.h" |
| 38 #include "sync/api/sync_error.h" | 38 #include "sync/api/sync_error.h" |
| 39 #include "sync/api/time.h" | 39 #include "sync/api/time.h" |
| 40 #include "sync/internal_api/public/base/model_type.h" | 40 #include "sync/internal_api/public/base/model_type.h" |
| 41 #include "sync/internal_api/public/base/model_type_invalidation_map.h" | |
| 42 #include "sync/internal_api/public/read_node.h" | 41 #include "sync/internal_api/public/read_node.h" |
| 43 #include "sync/internal_api/public/read_transaction.h" | 42 #include "sync/internal_api/public/read_transaction.h" |
| 44 #include "sync/internal_api/public/write_node.h" | 43 #include "sync/internal_api/public/write_node.h" |
| 45 #include "sync/internal_api/public/write_transaction.h" | 44 #include "sync/internal_api/public/write_transaction.h" |
| 46 #include "sync/protocol/session_specifics.pb.h" | 45 #include "sync/protocol/session_specifics.pb.h" |
| 47 #include "sync/syncable/directory.h" | 46 #include "sync/syncable/directory.h" |
| 48 #include "sync/syncable/syncable_read_transaction.h" | 47 #include "sync/syncable/syncable_read_transaction.h" |
| 49 #include "sync/syncable/syncable_write_transaction.h" | 48 #include "sync/syncable/syncable_write_transaction.h" |
| 50 #if defined(OS_LINUX) | 49 #if defined(OS_LINUX) |
| 51 #include "base/linux_util.h" | 50 #include "base/linux_util.h" |
| (...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1181 tab_s->set_tab_id(new_tab_id); | 1180 tab_s->set_tab_id(new_tab_id); |
| 1182 tab_node.SetSessionSpecifics(session_specifics); | 1181 tab_node.SetSessionSpecifics(session_specifics); |
| 1183 // Update tab node pool with the new association. | 1182 // Update tab node pool with the new association. |
| 1184 local_tab_pool_.ReassociateTabNode(tab_node_id, new_tab_id); | 1183 local_tab_pool_.ReassociateTabNode(tab_node_id, new_tab_id); |
| 1185 } | 1184 } |
| 1186 } | 1185 } |
| 1187 } | 1186 } |
| 1188 } | 1187 } |
| 1189 | 1188 |
| 1190 } // namespace browser_sync | 1189 } // namespace browser_sync |
| OLD | NEW |