Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: chrome/browser/sync/sync_error_notifier_factory_ash.cc

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_error_notifier_factory_ash.h" 5 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/sync/profile_sync_service_factory.h" 10 #include "chrome/browser/sync/profile_sync_service_factory.h"
11 #include "chrome/browser/sync/sync_error_notifier_ash.h" 11 #include "chrome/browser/sync/sync_error_notifier_ash.h"
12 #include "components/browser_sync/browser/profile_sync_service.h" 12 #include "components/browser_sync/profile_sync_service.h"
13 #include "components/keyed_service/content/browser_context_dependency_manager.h" 13 #include "components/keyed_service/content/browser_context_dependency_manager.h"
14 14
15 SyncErrorNotifierFactory::SyncErrorNotifierFactory() 15 SyncErrorNotifierFactory::SyncErrorNotifierFactory()
16 : BrowserContextKeyedServiceFactory( 16 : BrowserContextKeyedServiceFactory(
17 "SyncErrorNotifier", 17 "SyncErrorNotifier",
18 BrowserContextDependencyManager::GetInstance()) { 18 BrowserContextDependencyManager::GetInstance()) {
19 DependsOn(ProfileSyncServiceFactory::GetInstance()); 19 DependsOn(ProfileSyncServiceFactory::GetInstance());
20 } 20 }
21 21
22 SyncErrorNotifierFactory::~SyncErrorNotifierFactory() {} 22 SyncErrorNotifierFactory::~SyncErrorNotifierFactory() {}
(...skipping 22 matching lines...) Expand all
45 if (!profile_sync_service) 45 if (!profile_sync_service)
46 return NULL; 46 return NULL;
47 47
48 SyncErrorController* sync_error_controller = 48 SyncErrorController* sync_error_controller =
49 profile_sync_service->sync_error_controller(); 49 profile_sync_service->sync_error_controller();
50 if (!sync_error_controller) 50 if (!sync_error_controller)
51 return NULL; 51 return NULL;
52 52
53 return new SyncErrorNotifier(sync_error_controller, profile); 53 return new SyncErrorNotifier(sync_error_controller, profile);
54 } 54 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_error_notifier_ash_unittest.cc ('k') | chrome/browser/sync/sync_global_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698