| 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 "components/browser_sync/browser/profile_sync_service.h" | 5 #include "components/browser_sync/browser/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cstddef> | 9 #include <cstddef> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "components/prefs/json_pref_store.h" | 40 #include "components/prefs/json_pref_store.h" |
| 41 #include "components/signin/core/browser/about_signin_internals.h" | 41 #include "components/signin/core/browser/about_signin_internals.h" |
| 42 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 42 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
| 43 #include "components/signin/core/browser/signin_manager.h" | 43 #include "components/signin/core/browser/signin_manager.h" |
| 44 #include "components/signin/core/browser/signin_metrics.h" | 44 #include "components/signin/core/browser/signin_metrics.h" |
| 45 #include "components/strings/grit/components_strings.h" | 45 #include "components/strings/grit/components_strings.h" |
| 46 #include "components/sync/api/model_type_store.h" | 46 #include "components/sync/api/model_type_store.h" |
| 47 #include "components/sync/api/sync_error.h" | 47 #include "components/sync/api/sync_error.h" |
| 48 #include "components/sync/base/cryptographer.h" | 48 #include "components/sync/base/cryptographer.h" |
| 49 #include "components/sync/base/experiments.h" | 49 #include "components/sync/base/experiments.h" |
| 50 #include "components/sync/base/passphrase_type.h" |
| 50 #include "components/sync/base/stop_source.h" | 51 #include "components/sync/base/stop_source.h" |
| 51 #include "components/sync/base/sync_db_util.h" | 52 #include "components/sync/base/sync_db_util.h" |
| 52 #include "components/sync/core/configure_reason.h" | 53 #include "components/sync/core/configure_reason.h" |
| 53 #include "components/sync/core/http_bridge_network_resources.h" | 54 #include "components/sync/core/http_bridge_network_resources.h" |
| 54 #include "components/sync/core/network_resources.h" | 55 #include "components/sync/core/network_resources.h" |
| 55 #include "components/sync/core/shared_model_type_processor.h" | 56 #include "components/sync/core/shared_model_type_processor.h" |
| 56 #include "components/sync/core/shutdown_reason.h" | 57 #include "components/sync/core/shutdown_reason.h" |
| 57 #include "components/sync/core/sync_encryption_handler.h" | 58 #include "components/sync/core/sync_encryption_handler.h" |
| 58 #include "components/sync/device_info/device_info.h" | 59 #include "components/sync/device_info/device_info.h" |
| 59 #include "components/sync/device_info/device_info_service.h" | 60 #include "components/sync/device_info/device_info_service.h" |
| (...skipping 2471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2531 if (--outstanding_setup_in_progress_handles_ != 0) | 2532 if (--outstanding_setup_in_progress_handles_ != 0) |
| 2532 return; | 2533 return; |
| 2533 | 2534 |
| 2534 DCHECK(startup_controller_->IsSetupInProgress()); | 2535 DCHECK(startup_controller_->IsSetupInProgress()); |
| 2535 startup_controller_->SetSetupInProgress(false); | 2536 startup_controller_->SetSetupInProgress(false); |
| 2536 | 2537 |
| 2537 if (IsBackendInitialized()) | 2538 if (IsBackendInitialized()) |
| 2538 ReconfigureDatatypeManager(); | 2539 ReconfigureDatatypeManager(); |
| 2539 NotifyObservers(); | 2540 NotifyObservers(); |
| 2540 } | 2541 } |
| OLD | NEW |