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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 #include "chrome/browser/sync/sync_error_controller.h" | 51 #include "chrome/browser/sync/sync_error_controller.h" |
52 #include "chrome/browser/ui/browser.h" | 52 #include "chrome/browser/ui/browser.h" |
53 #include "chrome/browser/ui/browser_list.h" | 53 #include "chrome/browser/ui/browser_list.h" |
54 #include "chrome/browser/ui/browser_window.h" | 54 #include "chrome/browser/ui/browser_window.h" |
55 #include "chrome/browser/ui/global_error/global_error_service.h" | 55 #include "chrome/browser/ui/global_error/global_error_service.h" |
56 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 56 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
57 #include "chrome/common/chrome_switches.h" | 57 #include "chrome/common/chrome_switches.h" |
58 #include "chrome/common/chrome_version_info.h" | 58 #include "chrome/common/chrome_version_info.h" |
59 #include "chrome/common/pref_names.h" | 59 #include "chrome/common/pref_names.h" |
60 #include "chrome/common/url_constants.h" | 60 #include "chrome/common/url_constants.h" |
| 61 #include "components/pref_registry/pref_registry_syncable.h" |
61 #include "components/signin/core/browser/about_signin_internals.h" | 62 #include "components/signin/core/browser/about_signin_internals.h" |
62 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 63 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
63 #include "components/signin/core/browser/signin_manager.h" | 64 #include "components/signin/core/browser/signin_manager.h" |
64 #include "components/sync_driver/change_processor.h" | 65 #include "components/sync_driver/change_processor.h" |
65 #include "components/sync_driver/data_type_controller.h" | 66 #include "components/sync_driver/data_type_controller.h" |
66 #include "components/sync_driver/pref_names.h" | 67 #include "components/sync_driver/pref_names.h" |
67 #include "components/sync_driver/system_encryptor.h" | 68 #include "components/sync_driver/system_encryptor.h" |
68 #include "components/sync_driver/user_selectable_sync_type.h" | 69 #include "components/sync_driver/user_selectable_sync_type.h" |
69 #include "components/user_prefs/pref_registry_syncable.h" | |
70 #include "content/public/browser/notification_details.h" | 70 #include "content/public/browser/notification_details.h" |
71 #include "content/public/browser/notification_service.h" | 71 #include "content/public/browser/notification_service.h" |
72 #include "content/public/browser/notification_source.h" | 72 #include "content/public/browser/notification_source.h" |
73 #include "grit/generated_resources.h" | 73 #include "grit/generated_resources.h" |
74 #include "net/cookies/cookie_monster.h" | 74 #include "net/cookies/cookie_monster.h" |
75 #include "net/url_request/url_request_context_getter.h" | 75 #include "net/url_request/url_request_context_getter.h" |
76 #include "sync/api/sync_error.h" | 76 #include "sync/api/sync_error.h" |
77 #include "sync/internal_api/public/configure_reason.h" | 77 #include "sync/internal_api/public/configure_reason.h" |
78 #include "sync/internal_api/public/http_bridge_network_resources.h" | 78 #include "sync/internal_api/public/http_bridge_network_resources.h" |
79 #include "sync/internal_api/public/network_resources.h" | 79 #include "sync/internal_api/public/network_resources.h" |
(...skipping 2291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2371 status.last_get_token_error = last_get_token_error_; | 2371 status.last_get_token_error = last_get_token_error_; |
2372 if (request_access_token_retry_timer_.IsRunning()) | 2372 if (request_access_token_retry_timer_.IsRunning()) |
2373 status.next_token_request_time = next_token_request_time_; | 2373 status.next_token_request_time = next_token_request_time_; |
2374 return status; | 2374 return status; |
2375 } | 2375 } |
2376 | 2376 |
2377 void ProfileSyncService::OverrideNetworkResourcesForTest( | 2377 void ProfileSyncService::OverrideNetworkResourcesForTest( |
2378 scoped_ptr<syncer::NetworkResources> network_resources) { | 2378 scoped_ptr<syncer::NetworkResources> network_resources) { |
2379 network_resources_ = network_resources.Pass(); | 2379 network_resources_ = network_resources.Pass(); |
2380 } | 2380 } |
OLD | NEW |