OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
6 | 6 |
7 #include <cstddef> | 7 #include <cstddef> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 #include "chrome/common/chrome_switches.h" | 50 #include "chrome/common/chrome_switches.h" |
51 #include "chrome/common/chrome_version_info.h" | 51 #include "chrome/common/chrome_version_info.h" |
52 #include "chrome/common/net/gaia/gaia_constants.h" | 52 #include "chrome/common/net/gaia/gaia_constants.h" |
53 #include "chrome/common/time_format.h" | 53 #include "chrome/common/time_format.h" |
54 #include "chrome/common/url_constants.h" | 54 #include "chrome/common/url_constants.h" |
55 #include "content/public/browser/notification_details.h" | 55 #include "content/public/browser/notification_details.h" |
56 #include "content/public/browser/notification_source.h" | 56 #include "content/public/browser/notification_source.h" |
57 #include "grit/generated_resources.h" | 57 #include "grit/generated_resources.h" |
58 #include "net/cookies/cookie_monster.h" | 58 #include "net/cookies/cookie_monster.h" |
59 #include "sync/api/sync_error.h" | 59 #include "sync/api/sync_error.h" |
60 #include "sync/internal_api/configure_reason.h" | 60 #include "sync/internal_api/public/configure_reason.h" |
| 61 #include "sync/internal_api/public/util/experiments.h" |
61 #include "sync/js/js_arg_list.h" | 62 #include "sync/js/js_arg_list.h" |
62 #include "sync/js/js_event_details.h" | 63 #include "sync/js/js_event_details.h" |
63 #include "sync/util/cryptographer.h" | 64 #include "sync/util/cryptographer.h" |
64 #include "sync/util/experiments.h" | |
65 #include "ui/base/l10n/l10n_util.h" | 65 #include "ui/base/l10n/l10n_util.h" |
66 | 66 |
67 using browser_sync::ChangeProcessor; | 67 using browser_sync::ChangeProcessor; |
68 using browser_sync::DataTypeController; | 68 using browser_sync::DataTypeController; |
69 using browser_sync::DataTypeManager; | 69 using browser_sync::DataTypeManager; |
70 using browser_sync::JsBackend; | 70 using browser_sync::JsBackend; |
71 using browser_sync::JsController; | 71 using browser_sync::JsController; |
72 using browser_sync::JsEventDetails; | 72 using browser_sync::JsEventDetails; |
73 using browser_sync::JsEventHandler; | 73 using browser_sync::JsEventHandler; |
74 using browser_sync::SyncBackendHost; | 74 using browser_sync::SyncBackendHost; |
(...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1702 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. | 1702 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. |
1703 ProfileSyncService* old_this = this; | 1703 ProfileSyncService* old_this = this; |
1704 this->~ProfileSyncService(); | 1704 this->~ProfileSyncService(); |
1705 new(old_this) ProfileSyncService( | 1705 new(old_this) ProfileSyncService( |
1706 new ProfileSyncComponentsFactoryImpl(profile, | 1706 new ProfileSyncComponentsFactoryImpl(profile, |
1707 CommandLine::ForCurrentProcess()), | 1707 CommandLine::ForCurrentProcess()), |
1708 profile, | 1708 profile, |
1709 signin, | 1709 signin, |
1710 behavior); | 1710 behavior); |
1711 } | 1711 } |
OLD | NEW |