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

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

Issue 2657823005: Move //c/b/services/gcm/ to //c/b/gcm/ (Closed)
Patch Set: Created 3 years, 11 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 (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_factory.h" 5 #include "chrome/browser/sync/profile_sync_service_factory.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/autofill/personal_data_manager_factory.h" 13 #include "chrome/browser/autofill/personal_data_manager_factory.h"
14 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/defaults.h" 16 #include "chrome/browser/defaults.h"
17 #include "chrome/browser/gcm/gcm_profile_service_factory.h"
17 #include "chrome/browser/history/history_service_factory.h" 18 #include "chrome/browser/history/history_service_factory.h"
18 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" 19 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
19 #include "chrome/browser/password_manager/password_store_factory.h" 20 #include "chrome/browser/password_manager/password_store_factory.h"
20 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/profiles/profile_manager.h" 22 #include "chrome/browser/profiles/profile_manager.h"
22 #include "chrome/browser/search_engines/template_url_service_factory.h" 23 #include "chrome/browser/search_engines/template_url_service_factory.h"
23 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
24 #include "chrome/browser/signin/about_signin_internals_factory.h" 24 #include "chrome/browser/signin/about_signin_internals_factory.h"
25 #include "chrome/browser/signin/chrome_signin_client_factory.h" 25 #include "chrome/browser/signin/chrome_signin_client_factory.h"
26 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h" 26 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
27 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 27 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
28 #include "chrome/browser/signin/signin_manager_factory.h" 28 #include "chrome/browser/signin/signin_manager_factory.h"
29 #include "chrome/browser/sync/chrome_sync_client.h" 29 #include "chrome/browser/sync/chrome_sync_client.h"
30 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h" 30 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
31 #include "chrome/browser/themes/theme_service_factory.h" 31 #include "chrome/browser/themes/theme_service_factory.h"
32 #include "chrome/browser/web_data_service_factory.h" 32 #include "chrome/browser/web_data_service_factory.h"
33 #include "chrome/common/channel_info.h" 33 #include "chrome/common/channel_info.h"
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 // static 232 // static
233 void ProfileSyncServiceFactory::SetSyncClientFactoryForTest( 233 void ProfileSyncServiceFactory::SetSyncClientFactoryForTest(
234 SyncClientFactory* client_factory) { 234 SyncClientFactory* client_factory) {
235 client_factory_ = client_factory; 235 client_factory_ = client_factory;
236 } 236 }
237 237
238 // static 238 // static
239 ProfileSyncServiceFactory::SyncClientFactory* 239 ProfileSyncServiceFactory::SyncClientFactory*
240 ProfileSyncServiceFactory::client_factory_ = nullptr; 240 ProfileSyncServiceFactory::client_factory_ = nullptr;
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698