| 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 21 matching lines...) Expand all Loading... |
| 32 #include "chrome/browser/signin/token_service_factory.h" | 32 #include "chrome/browser/signin/token_service_factory.h" |
| 33 #include "chrome/browser/sync/api/sync_error.h" | 33 #include "chrome/browser/sync/api/sync_error.h" |
| 34 #include "chrome/browser/sync/backend_migrator.h" | 34 #include "chrome/browser/sync/backend_migrator.h" |
| 35 #include "chrome/browser/sync/glue/change_processor.h" | 35 #include "chrome/browser/sync/glue/change_processor.h" |
| 36 #include "chrome/browser/sync/glue/chrome_encryptor.h" | 36 #include "chrome/browser/sync/glue/chrome_encryptor.h" |
| 37 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" | 37 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" |
| 38 #include "chrome/browser/sync/glue/data_type_controller.h" | 38 #include "chrome/browser/sync/glue/data_type_controller.h" |
| 39 #include "chrome/browser/sync/glue/session_data_type_controller.h" | 39 #include "chrome/browser/sync/glue/session_data_type_controller.h" |
| 40 #include "chrome/browser/sync/glue/session_model_associator.h" | 40 #include "chrome/browser/sync/glue/session_model_associator.h" |
| 41 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" | 41 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" |
| 42 #include "chrome/browser/sync/internal_api/configure_reason.h" | |
| 43 #include "chrome/browser/sync/internal_api/sync_manager.h" | |
| 44 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" | 42 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" |
| 45 #include "chrome/browser/sync/sync_global_error.h" | 43 #include "chrome/browser/sync/sync_global_error.h" |
| 46 #include "chrome/browser/sync/user_selectable_sync_type.h" | 44 #include "chrome/browser/sync/user_selectable_sync_type.h" |
| 47 #include "chrome/browser/ui/browser.h" | 45 #include "chrome/browser/ui/browser.h" |
| 48 #include "chrome/browser/ui/browser_list.h" | 46 #include "chrome/browser/ui/browser_list.h" |
| 49 #include "chrome/browser/ui/browser_window.h" | 47 #include "chrome/browser/ui/browser_window.h" |
| 50 #include "chrome/browser/ui/global_error_service.h" | 48 #include "chrome/browser/ui/global_error_service.h" |
| 51 #include "chrome/browser/ui/global_error_service_factory.h" | 49 #include "chrome/browser/ui/global_error_service_factory.h" |
| 52 #include "chrome/browser/ui/webui/signin/login_ui_service.h" | 50 #include "chrome/browser/ui/webui/signin/login_ui_service.h" |
| 53 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" | 51 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" |
| 54 #include "chrome/common/chrome_notification_types.h" | 52 #include "chrome/common/chrome_notification_types.h" |
| 55 #include "chrome/common/chrome_switches.h" | 53 #include "chrome/common/chrome_switches.h" |
| 56 #include "chrome/common/chrome_version_info.h" | 54 #include "chrome/common/chrome_version_info.h" |
| 57 #include "chrome/common/net/gaia/gaia_constants.h" | 55 #include "chrome/common/net/gaia/gaia_constants.h" |
| 58 #include "chrome/common/time_format.h" | 56 #include "chrome/common/time_format.h" |
| 59 #include "chrome/common/url_constants.h" | 57 #include "chrome/common/url_constants.h" |
| 60 #include "content/public/browser/notification_details.h" | 58 #include "content/public/browser/notification_details.h" |
| 61 #include "content/public/browser/notification_source.h" | 59 #include "content/public/browser/notification_source.h" |
| 62 #include "grit/generated_resources.h" | 60 #include "grit/generated_resources.h" |
| 63 #include "net/cookies/cookie_monster.h" | 61 #include "net/cookies/cookie_monster.h" |
| 62 #include "sync/internal_api/configure_reason.h" |
| 64 #include "sync/js/js_arg_list.h" | 63 #include "sync/js/js_arg_list.h" |
| 65 #include "sync/js/js_event_details.h" | 64 #include "sync/js/js_event_details.h" |
| 66 #include "sync/util/cryptographer.h" | 65 #include "sync/util/cryptographer.h" |
| 67 #include "ui/base/l10n/l10n_util.h" | 66 #include "ui/base/l10n/l10n_util.h" |
| 68 | 67 |
| 69 using browser_sync::ChangeProcessor; | 68 using browser_sync::ChangeProcessor; |
| 70 using browser_sync::DataTypeController; | 69 using browser_sync::DataTypeController; |
| 71 using browser_sync::DataTypeManager; | 70 using browser_sync::DataTypeManager; |
| 72 using browser_sync::JsBackend; | 71 using browser_sync::JsBackend; |
| 73 using browser_sync::JsController; | 72 using browser_sync::JsController; |
| (...skipping 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1643 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. | 1642 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. |
| 1644 ProfileSyncService* old_this = this; | 1643 ProfileSyncService* old_this = this; |
| 1645 this->~ProfileSyncService(); | 1644 this->~ProfileSyncService(); |
| 1646 new(old_this) ProfileSyncService( | 1645 new(old_this) ProfileSyncService( |
| 1647 new ProfileSyncComponentsFactoryImpl(profile, | 1646 new ProfileSyncComponentsFactoryImpl(profile, |
| 1648 CommandLine::ForCurrentProcess()), | 1647 CommandLine::ForCurrentProcess()), |
| 1649 profile, | 1648 profile, |
| 1650 signin, | 1649 signin, |
| 1651 behavior); | 1650 behavior); |
| 1652 } | 1651 } |
| OLD | NEW |