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

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

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 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 | Annotate | Revision Log
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>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/browser/sync/sync_global_error.h" 42 #include "chrome/browser/sync/sync_global_error.h"
43 #include "chrome/browser/sync/user_selectable_sync_type.h" 43 #include "chrome/browser/sync/user_selectable_sync_type.h"
44 #include "chrome/browser/ui/browser.h" 44 #include "chrome/browser/ui/browser.h"
45 #include "chrome/browser/ui/browser_list.h" 45 #include "chrome/browser/ui/browser_list.h"
46 #include "chrome/browser/ui/browser_window.h" 46 #include "chrome/browser/ui/browser_window.h"
47 #include "chrome/browser/ui/global_error/global_error_service.h" 47 #include "chrome/browser/ui/global_error/global_error_service.h"
48 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 48 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
49 #include "chrome/common/chrome_notification_types.h" 49 #include "chrome/common/chrome_notification_types.h"
50 #include "chrome/common/chrome_switches.h" 50 #include "chrome/common/chrome_switches.h"
51 #include "chrome/common/chrome_version_info.h" 51 #include "chrome/common/chrome_version_info.h"
52 #include "chrome/common/net/gaia/gaia_constants.h"
53 #include "chrome/common/time_format.h" 52 #include "chrome/common/time_format.h"
54 #include "chrome/common/url_constants.h" 53 #include "chrome/common/url_constants.h"
55 #include "content/public/browser/notification_details.h" 54 #include "content/public/browser/notification_details.h"
56 #include "content/public/browser/notification_service.h" 55 #include "content/public/browser/notification_service.h"
57 #include "content/public/browser/notification_source.h" 56 #include "content/public/browser/notification_source.h"
57 #include "google_apis/gaia/gaia_constants.h"
58 #include "grit/generated_resources.h" 58 #include "grit/generated_resources.h"
59 #include "net/cookies/cookie_monster.h" 59 #include "net/cookies/cookie_monster.h"
60 #include "sync/api/sync_error.h" 60 #include "sync/api/sync_error.h"
61 #include "sync/internal_api/public/configure_reason.h" 61 #include "sync/internal_api/public/configure_reason.h"
62 #include "sync/internal_api/public/sync_encryption_handler.h" 62 #include "sync/internal_api/public/sync_encryption_handler.h"
63 #include "sync/internal_api/public/util/experiments.h" 63 #include "sync/internal_api/public/util/experiments.h"
64 #include "sync/internal_api/public/util/sync_string_conversions.h" 64 #include "sync/internal_api/public/util/sync_string_conversions.h"
65 #include "sync/js/js_arg_list.h" 65 #include "sync/js/js_arg_list.h"
66 #include "sync/js/js_event_details.h" 66 #include "sync/js/js_event_details.h"
67 #include "sync/util/cryptographer.h" 67 #include "sync/util/cryptographer.h"
(...skipping 1740 matching lines...) Expand 10 before | Expand all | Expand 10 after
1808 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru. 1808 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru.
1809 ProfileSyncService* old_this = this; 1809 ProfileSyncService* old_this = this;
1810 this->~ProfileSyncService(); 1810 this->~ProfileSyncService();
1811 new(old_this) ProfileSyncService( 1811 new(old_this) ProfileSyncService(
1812 new ProfileSyncComponentsFactoryImpl(profile, 1812 new ProfileSyncComponentsFactoryImpl(profile,
1813 CommandLine::ForCurrentProcess()), 1813 CommandLine::ForCurrentProcess()),
1814 profile, 1814 profile,
1815 signin, 1815 signin,
1816 behavior); 1816 behavior);
1817 } 1817 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/profile_sync_service_autofill_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698