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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/invalidations/invalidator_storage.cc ('k') | chrome/browser/sync/profile_sync_service_preference_unittest.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.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>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/memory/ref_counted.h" 18 #include "base/memory/ref_counted.h"
19 #include "base/message_loop.h" 19 #include "base/message_loop.h"
20 #include "base/metrics/histogram.h" 20 #include "base/metrics/histogram.h"
21 #include "base/string16.h" 21 #include "base/string16.h"
22 #include "base/stringprintf.h" 22 #include "base/stringprintf.h"
23 #include "base/threading/thread_restrictions.h" 23 #include "base/threading/thread_restrictions.h"
24 #include "build/build_config.h" 24 #include "build/build_config.h"
25 #include "chrome/browser/about_flags.h" 25 #include "chrome/browser/about_flags.h"
26 #include "chrome/browser/browser_process.h" 26 #include "chrome/browser/browser_process.h"
27 #include "chrome/browser/defaults.h" 27 #include "chrome/browser/defaults.h"
28 #include "chrome/browser/net/chrome_cookie_notification_details.h" 28 #include "chrome/browser/net/chrome_cookie_notification_details.h"
29 #include "chrome/browser/prefs/pref_registry_syncable.h"
30 #include "chrome/browser/prefs/pref_service_syncable.h" 29 #include "chrome/browser/prefs/pref_service_syncable.h"
31 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
32 #include "chrome/browser/signin/signin_manager.h" 31 #include "chrome/browser/signin/signin_manager.h"
33 #include "chrome/browser/signin/signin_manager_factory.h" 32 #include "chrome/browser/signin/signin_manager_factory.h"
34 #include "chrome/browser/signin/token_service.h" 33 #include "chrome/browser/signin/token_service.h"
35 #include "chrome/browser/signin/token_service_factory.h" 34 #include "chrome/browser/signin/token_service_factory.h"
36 #include "chrome/browser/sync/backend_migrator.h" 35 #include "chrome/browser/sync/backend_migrator.h"
37 #include "chrome/browser/sync/glue/change_processor.h" 36 #include "chrome/browser/sync/glue/change_processor.h"
38 #include "chrome/browser/sync/glue/chrome_encryptor.h" 37 #include "chrome/browser/sync/glue/chrome_encryptor.h"
39 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" 38 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h"
(...skipping 10 matching lines...) Expand all
50 #include "chrome/browser/ui/browser_list.h" 49 #include "chrome/browser/ui/browser_list.h"
51 #include "chrome/browser/ui/browser_window.h" 50 #include "chrome/browser/ui/browser_window.h"
52 #include "chrome/browser/ui/global_error/global_error_service.h" 51 #include "chrome/browser/ui/global_error/global_error_service.h"
53 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 52 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
54 #include "chrome/common/chrome_notification_types.h" 53 #include "chrome/common/chrome_notification_types.h"
55 #include "chrome/common/chrome_switches.h" 54 #include "chrome/common/chrome_switches.h"
56 #include "chrome/common/chrome_version_info.h" 55 #include "chrome/common/chrome_version_info.h"
57 #include "chrome/common/pref_names.h" 56 #include "chrome/common/pref_names.h"
58 #include "chrome/common/time_format.h" 57 #include "chrome/common/time_format.h"
59 #include "chrome/common/url_constants.h" 58 #include "chrome/common/url_constants.h"
59 #include "components/user_prefs/pref_registry_syncable.h"
60 #include "content/public/browser/notification_details.h" 60 #include "content/public/browser/notification_details.h"
61 #include "content/public/browser/notification_service.h" 61 #include "content/public/browser/notification_service.h"
62 #include "content/public/browser/notification_source.h" 62 #include "content/public/browser/notification_source.h"
63 #include "google_apis/gaia/gaia_constants.h" 63 #include "google_apis/gaia/gaia_constants.h"
64 #include "grit/generated_resources.h" 64 #include "grit/generated_resources.h"
65 #include "net/cookies/cookie_monster.h" 65 #include "net/cookies/cookie_monster.h"
66 #include "sync/api/sync_error.h" 66 #include "sync/api/sync_error.h"
67 #include "sync/internal_api/public/configure_reason.h" 67 #include "sync/internal_api/public/configure_reason.h"
68 #include "sync/internal_api/public/sync_encryption_handler.h" 68 #include "sync/internal_api/public/sync_encryption_handler.h"
69 #include "sync/internal_api/public/util/experiments.h" 69 #include "sync/internal_api/public/util/experiments.h"
(...skipping 1906 matching lines...) Expand 10 before | Expand all | Expand 10 after
1976 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru. 1976 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru.
1977 ProfileSyncService* old_this = this; 1977 ProfileSyncService* old_this = this;
1978 this->~ProfileSyncService(); 1978 this->~ProfileSyncService();
1979 new(old_this) ProfileSyncService( 1979 new(old_this) ProfileSyncService(
1980 new ProfileSyncComponentsFactoryImpl(profile, 1980 new ProfileSyncComponentsFactoryImpl(profile,
1981 CommandLine::ForCurrentProcess()), 1981 CommandLine::ForCurrentProcess()),
1982 profile, 1982 profile,
1983 signin, 1983 signin,
1984 behavior); 1984 behavior);
1985 } 1985 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/invalidations/invalidator_storage.cc ('k') | chrome/browser/sync/profile_sync_service_preference_unittest.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698