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 "components/sync_bookmarks/bookmark_model_associator.h" | 5 #include "components/sync_bookmarks/bookmark_model_associator.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/containers/hash_tables.h" | |
12 #include "base/format_macros.h" | 11 #include "base/format_macros.h" |
13 #include "base/location.h" | 12 #include "base/location.h" |
14 #include "base/macros.h" | |
15 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
16 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
17 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
18 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
19 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
20 #include "base/threading/thread_task_runner_handle.h" | 18 #include "base/threading/thread_task_runner_handle.h" |
21 #include "components/bookmarks/browser/bookmark_client.h" | 19 #include "components/bookmarks/browser/bookmark_client.h" |
22 #include "components/bookmarks/browser/bookmark_model.h" | 20 #include "components/bookmarks/browser/bookmark_model.h" |
23 #include "components/sync/api/sync_error.h" | 21 #include "components/sync/api/sync_error.h" |
24 #include "components/sync/api/sync_merge_result.h" | 22 #include "components/sync/api/sync_merge_result.h" |
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1009 syncer::BOOKMARKS); | 1007 syncer::BOOKMARKS); |
1010 } else { | 1008 } else { |
1011 context->set_native_model_sync_state(BEHIND); | 1009 context->set_native_model_sync_state(BEHIND); |
1012 } | 1010 } |
1013 } | 1011 } |
1014 } | 1012 } |
1015 return syncer::SyncError(); | 1013 return syncer::SyncError(); |
1016 } | 1014 } |
1017 | 1015 |
1018 } // namespace sync_bookmarks | 1016 } // namespace sync_bookmarks |
OLD | NEW |