| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/sync_global_error_factory.h" | 5 #include "chrome/browser/sync/sync_global_error_factory.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/sync/profile_sync_service_factory.h" | 9 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 10 #include "chrome/browser/sync/sync_global_error.h" | 10 #include "chrome/browser/sync/sync_global_error.h" |
| 11 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | |
| 12 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" | 11 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" |
| 13 #include "components/browser_sync/profile_sync_service.h" | 12 #include "components/browser_sync/profile_sync_service.h" |
| 14 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 13 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
| 15 | 14 |
| 16 #if defined(USE_ASH) | 15 #if defined(USE_ASH) |
| 17 #include "ash/shell.h" | 16 #include "ash/shell.h" |
| 18 #endif | 17 #endif |
| 19 | 18 |
| 20 SyncGlobalErrorFactory::SyncGlobalErrorFactory() | 19 SyncGlobalErrorFactory::SyncGlobalErrorFactory() |
| 21 : BrowserContextKeyedServiceFactory( | 20 : BrowserContextKeyedServiceFactory( |
| 22 "SyncGlobalError", | 21 "SyncGlobalError", |
| 23 BrowserContextDependencyManager::GetInstance()) { | 22 BrowserContextDependencyManager::GetInstance()) { |
| 24 DependsOn(GlobalErrorServiceFactory::GetInstance()); | |
| 25 DependsOn(LoginUIServiceFactory::GetInstance()); | 23 DependsOn(LoginUIServiceFactory::GetInstance()); |
| 26 DependsOn(ProfileSyncServiceFactory::GetInstance()); | 24 DependsOn(ProfileSyncServiceFactory::GetInstance()); |
| 27 } | 25 } |
| 28 | 26 |
| 29 SyncGlobalErrorFactory::~SyncGlobalErrorFactory() {} | 27 SyncGlobalErrorFactory::~SyncGlobalErrorFactory() {} |
| 30 | 28 |
| 31 // static | 29 // static |
| 32 SyncGlobalError* SyncGlobalErrorFactory::GetForProfile( | 30 SyncGlobalError* SyncGlobalErrorFactory::GetForProfile( |
| 33 Profile* profile) { | 31 Profile* profile) { |
| 34 return static_cast<SyncGlobalError*>( | 32 return static_cast<SyncGlobalError*>( |
| (...skipping 17 matching lines...) Expand all Loading... |
| 52 ProfileSyncServiceFactory::GetForProfile(profile); | 50 ProfileSyncServiceFactory::GetForProfile(profile); |
| 53 | 51 |
| 54 if (!profile_sync_service) | 52 if (!profile_sync_service) |
| 55 return nullptr; | 53 return nullptr; |
| 56 | 54 |
| 57 syncer::SyncErrorController* sync_error_controller = | 55 syncer::SyncErrorController* sync_error_controller = |
| 58 profile_sync_service->sync_error_controller(); | 56 profile_sync_service->sync_error_controller(); |
| 59 if (!sync_error_controller) | 57 if (!sync_error_controller) |
| 60 return nullptr; | 58 return nullptr; |
| 61 | 59 |
| 62 return new SyncGlobalError(GlobalErrorServiceFactory::GetForProfile(profile), | 60 return new SyncGlobalError(LoginUIServiceFactory::GetForProfile(profile), |
| 63 LoginUIServiceFactory::GetForProfile(profile), | |
| 64 sync_error_controller, profile_sync_service); | 61 sync_error_controller, profile_sync_service); |
| 65 } | 62 } |
| OLD | NEW |