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

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

Issue 2708073002: Removing pre-material design menu setting. (Closed)
Patch Set: Replacing functions by variables Created 3 years, 10 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_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" 11 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
sky 2017/02/23 20:44:52 Is this include needed anymore?
jlebel 2017/03/06 13:09:29 Done.
12 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 12 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
13 #include "components/browser_sync/profile_sync_service.h" 13 #include "components/browser_sync/profile_sync_service.h"
14 #include "components/keyed_service/content/browser_context_dependency_manager.h" 14 #include "components/keyed_service/content/browser_context_dependency_manager.h"
15 15
16 #if defined(USE_ASH) 16 #if defined(USE_ASH)
17 #include "ash/shell.h" 17 #include "ash/shell.h"
18 #endif 18 #endif
19 19
20 SyncGlobalErrorFactory::SyncGlobalErrorFactory() 20 SyncGlobalErrorFactory::SyncGlobalErrorFactory()
21 : BrowserContextKeyedServiceFactory( 21 : BrowserContextKeyedServiceFactory(
(...skipping 30 matching lines...) Expand all
52 ProfileSyncServiceFactory::GetForProfile(profile); 52 ProfileSyncServiceFactory::GetForProfile(profile);
53 53
54 if (!profile_sync_service) 54 if (!profile_sync_service)
55 return nullptr; 55 return nullptr;
56 56
57 syncer::SyncErrorController* sync_error_controller = 57 syncer::SyncErrorController* sync_error_controller =
58 profile_sync_service->sync_error_controller(); 58 profile_sync_service->sync_error_controller();
59 if (!sync_error_controller) 59 if (!sync_error_controller)
60 return nullptr; 60 return nullptr;
61 61
62 return new SyncGlobalError(GlobalErrorServiceFactory::GetForProfile(profile), 62 return new SyncGlobalError(LoginUIServiceFactory::GetForProfile(profile),
63 LoginUIServiceFactory::GetForProfile(profile),
64 sync_error_controller, profile_sync_service); 63 sync_error_controller, profile_sync_service);
65 } 64 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698