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/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/location.h" |
11 #include "base/logging.h" | 12 #include "base/logging.h" |
12 #include "base/sys_info.h" | 13 #include "base/sys_info.h" |
13 #include "base/tracked.h" | |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/sessions/session_service_factory.h" | 16 #include "chrome/browser/sessions/session_service_factory.h" |
17 #include "chrome/browser/sync/api/sync_error.h" | 17 #include "chrome/browser/sync/api/sync_error.h" |
18 #include "chrome/browser/sync/glue/synced_session.h" | 18 #include "chrome/browser/sync/glue/synced_session.h" |
19 #include "chrome/browser/sync/glue/synced_tab_delegate.h" | 19 #include "chrome/browser/sync/glue/synced_tab_delegate.h" |
20 #include "chrome/browser/sync/glue/synced_window_delegate.h" | 20 #include "chrome/browser/sync/glue/synced_window_delegate.h" |
21 #include "chrome/browser/sync/internal_api/read_node.h" | 21 #include "chrome/browser/sync/internal_api/read_node.h" |
22 #include "chrome/browser/sync/internal_api/read_transaction.h" | 22 #include "chrome/browser/sync/internal_api/read_transaction.h" |
23 #include "chrome/browser/sync/internal_api/write_node.h" | 23 #include "chrome/browser/sync/internal_api/write_node.h" |
(...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1190 char computer_name[MAX_COMPUTERNAME_LENGTH + 1]; | 1190 char computer_name[MAX_COMPUTERNAME_LENGTH + 1]; |
1191 DWORD size = sizeof(computer_name); | 1191 DWORD size = sizeof(computer_name); |
1192 if (GetComputerNameA(computer_name, &size)) { | 1192 if (GetComputerNameA(computer_name, &size)) { |
1193 return computer_name; | 1193 return computer_name; |
1194 } | 1194 } |
1195 return std::string(); | 1195 return std::string(); |
1196 } | 1196 } |
1197 #endif | 1197 #endif |
1198 | 1198 |
1199 } // namespace browser_sync | 1199 } // namespace browser_sync |
OLD | NEW |