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/bookmark_model_associator.h" | 5 #include "chrome/browser/sync/glue/bookmark_model_associator.h" |
6 | 6 |
7 #include <stack> | 7 #include <stack> |
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/hash_tables.h" | 11 #include "base/containers/hash_tables.h" |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
14 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "chrome/browser/bookmarks/bookmark_model.h" | 16 #include "chrome/browser/bookmarks/bookmark_model.h" |
17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/browser/sync/glue/bookmark_change_processor.h" | 18 #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
19 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
20 #include "sync/api/sync_error.h" | 20 #include "sync/api/sync_error.h" |
21 #include "sync/internal_api/public/delete_journal.h" | 21 #include "sync/internal_api/public/delete_journal.h" |
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
713 ModelTypeToHistogramInt(syncer::BOOKMARKS), | 713 ModelTypeToHistogramInt(syncer::BOOKMARKS), |
714 syncer::MODEL_TYPE_COUNT); | 714 syncer::MODEL_TYPE_COUNT); |
715 // Clear version on bookmark model so that we only report error once. | 715 // Clear version on bookmark model so that we only report error once. |
716 bookmark_model_->DeleteNodeMetaInfo(bookmark_model_->root_node(), | 716 bookmark_model_->DeleteNodeMetaInfo(bookmark_model_->root_node(), |
717 kBookmarkTransactionVersionKey); | 717 kBookmarkTransactionVersionKey); |
718 } | 718 } |
719 } | 719 } |
720 } | 720 } |
721 | 721 |
722 } // namespace browser_sync | 722 } // namespace browser_sync |
OLD | NEW |