| 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 <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 #include "content/public/browser/notification_service.h" | 86 #include "content/public/browser/notification_service.h" |
| 87 #include "content/public/browser/notification_source.h" | 87 #include "content/public/browser/notification_source.h" |
| 88 #include "net/cookies/cookie_monster.h" | 88 #include "net/cookies/cookie_monster.h" |
| 89 #include "net/url_request/url_request_context_getter.h" | 89 #include "net/url_request/url_request_context_getter.h" |
| 90 #include "sync/api/sync_error.h" | 90 #include "sync/api/sync_error.h" |
| 91 #include "sync/internal_api/public/configure_reason.h" | 91 #include "sync/internal_api/public/configure_reason.h" |
| 92 #include "sync/internal_api/public/http_bridge_network_resources.h" | 92 #include "sync/internal_api/public/http_bridge_network_resources.h" |
| 93 #include "sync/internal_api/public/network_resources.h" | 93 #include "sync/internal_api/public/network_resources.h" |
| 94 #include "sync/internal_api/public/sessions/type_debug_info_observer.h" | 94 #include "sync/internal_api/public/sessions/type_debug_info_observer.h" |
| 95 #include "sync/internal_api/public/shutdown_reason.h" | 95 #include "sync/internal_api/public/shutdown_reason.h" |
| 96 #include "sync/internal_api/public/sync_context_proxy.h" | |
| 97 #include "sync/internal_api/public/sync_encryption_handler.h" | 96 #include "sync/internal_api/public/sync_encryption_handler.h" |
| 98 #include "sync/internal_api/public/util/experiments.h" | 97 #include "sync/internal_api/public/util/experiments.h" |
| 99 #include "sync/internal_api/public/util/sync_db_util.h" | 98 #include "sync/internal_api/public/util/sync_db_util.h" |
| 100 #include "sync/internal_api/public/util/sync_string_conversions.h" | 99 #include "sync/internal_api/public/util/sync_string_conversions.h" |
| 101 #include "sync/js/js_event_details.h" | 100 #include "sync/js/js_event_details.h" |
| 102 #include "sync/protocol/sync.pb.h" | 101 #include "sync/protocol/sync.pb.h" |
| 103 #include "sync/syncable/directory.h" | 102 #include "sync/syncable/directory.h" |
| 104 #include "sync/util/cryptographer.h" | 103 #include "sync/util/cryptographer.h" |
| 105 #include "ui/base/l10n/l10n_util.h" | 104 #include "ui/base/l10n/l10n_util.h" |
| 106 #include "ui/base/l10n/time_format.h" | 105 #include "ui/base/l10n/time_format.h" |
| (...skipping 2615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2722 } | 2721 } |
| 2723 | 2722 |
| 2724 std::string ProfileSyncService::unrecoverable_error_message() const { | 2723 std::string ProfileSyncService::unrecoverable_error_message() const { |
| 2725 return unrecoverable_error_message_; | 2724 return unrecoverable_error_message_; |
| 2726 } | 2725 } |
| 2727 | 2726 |
| 2728 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() | 2727 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() |
| 2729 const { | 2728 const { |
| 2730 return unrecoverable_error_location_; | 2729 return unrecoverable_error_location_; |
| 2731 } | 2730 } |
| OLD | NEW |