| 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 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/location.h" | 12 #include "base/location.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/safe_numerics.h" | |
| 15 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 16 #include "base/threading/sequenced_worker_pool.h" | 15 #include "base/threading/sequenced_worker_pool.h" |
| 17 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
| 18 #include "chrome/browser/favicon/favicon_service_factory.h" | 17 #include "chrome/browser/favicon/favicon_service_factory.h" |
| 19 #include "chrome/browser/history/history_service.h" | 18 #include "chrome/browser/history/history_service.h" |
| 20 #if !defined(OS_ANDROID) | 19 #if !defined(OS_ANDROID) |
| 21 #include "chrome/browser/network_time/navigation_time_helper.h" | 20 #include "chrome/browser/network_time/navigation_time_helper.h" |
| 22 #endif | 21 #endif |
| 23 #include "chrome/browser/prefs/pref_service_syncable.h" | 22 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 24 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
| (...skipping 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1210 tab_s->set_tab_id(new_tab_id); | 1209 tab_s->set_tab_id(new_tab_id); |
| 1211 tab_node.SetSessionSpecifics(session_specifics); | 1210 tab_node.SetSessionSpecifics(session_specifics); |
| 1212 // Update tab node pool with the new association. | 1211 // Update tab node pool with the new association. |
| 1213 local_tab_pool_.ReassociateTabNode(tab_node_id, new_tab_id); | 1212 local_tab_pool_.ReassociateTabNode(tab_node_id, new_tab_id); |
| 1214 } | 1213 } |
| 1215 } | 1214 } |
| 1216 } | 1215 } |
| 1217 } | 1216 } |
| 1218 | 1217 |
| 1219 } // namespace browser_sync | 1218 } // namespace browser_sync |
| OLD | NEW |