| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/engine/syncapi.h" | 5 #include "chrome/browser/sync/engine/syncapi.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 | 8 |
| 9 #include <iomanip> | 9 #include <iomanip> |
| 10 #include <list> | 10 #include <list> |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h" | 39 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h" |
| 40 #include "chrome/browser/sync/protocol/password_specifics.pb.h" | 40 #include "chrome/browser/sync/protocol/password_specifics.pb.h" |
| 41 #include "chrome/browser/sync/protocol/preference_specifics.pb.h" | 41 #include "chrome/browser/sync/protocol/preference_specifics.pb.h" |
| 42 #include "chrome/browser/sync/protocol/service_constants.h" | 42 #include "chrome/browser/sync/protocol/service_constants.h" |
| 43 #include "chrome/browser/sync/protocol/sync.pb.h" | 43 #include "chrome/browser/sync/protocol/sync.pb.h" |
| 44 #include "chrome/browser/sync/protocol/theme_specifics.pb.h" | 44 #include "chrome/browser/sync/protocol/theme_specifics.pb.h" |
| 45 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" | 45 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" |
| 46 #include "chrome/browser/sync/sessions/sync_session_context.h" | 46 #include "chrome/browser/sync/sessions/sync_session_context.h" |
| 47 #include "chrome/browser/sync/syncable/directory_manager.h" | 47 #include "chrome/browser/sync/syncable/directory_manager.h" |
| 48 #include "chrome/browser/sync/syncable/syncable.h" | 48 #include "chrome/browser/sync/syncable/syncable.h" |
| 49 #include "chrome/browser/sync/util/character_set_converters.h" | |
| 50 #include "chrome/browser/sync/util/closure.h" | 49 #include "chrome/browser/sync/util/closure.h" |
| 51 #include "chrome/browser/sync/util/crypto_helpers.h" | 50 #include "chrome/browser/sync/util/crypto_helpers.h" |
| 52 #include "chrome/browser/sync/util/path_helpers.h" | 51 #include "chrome/browser/sync/util/path_helpers.h" |
| 53 #include "chrome/browser/sync/util/user_settings.h" | 52 #include "chrome/browser/sync/util/user_settings.h" |
| 54 #include "chrome/common/chrome_switches.h" | 53 #include "chrome/common/chrome_switches.h" |
| 55 #include "chrome/common/deprecated/event_sys.h" | 54 #include "chrome/common/deprecated/event_sys.h" |
| 56 #include "chrome/common/net/gaia/gaia_authenticator.h" | 55 #include "chrome/common/net/gaia/gaia_authenticator.h" |
| 57 #include "jingle/notifier/listener/mediator_thread_impl.h" | 56 #include "jingle/notifier/listener/mediator_thread_impl.h" |
| 58 #include "jingle/notifier/listener/notification_constants.h" | 57 #include "jingle/notifier/listener/notification_constants.h" |
| 59 #include "jingle/notifier/listener/talk_mediator.h" | 58 #include "jingle/notifier/listener/talk_mediator.h" |
| (...skipping 2065 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2125 UserShare* SyncManager::GetUserShare() const { | 2124 UserShare* SyncManager::GetUserShare() const { |
| 2126 DCHECK(data_->initialized()) << "GetUserShare requires initialization!"; | 2125 DCHECK(data_->initialized()) << "GetUserShare requires initialization!"; |
| 2127 return data_->GetUserShare(); | 2126 return data_->GetUserShare(); |
| 2128 } | 2127 } |
| 2129 | 2128 |
| 2130 SyncManager::ExtraAutofillChangeRecordData::~ExtraAutofillChangeRecordData() { | 2129 SyncManager::ExtraAutofillChangeRecordData::~ExtraAutofillChangeRecordData() { |
| 2131 delete pre_deletion_data; | 2130 delete pre_deletion_data; |
| 2132 } | 2131 } |
| 2133 | 2132 |
| 2134 } // namespace sync_api | 2133 } // namespace sync_api |
| OLD | NEW |