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

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

Issue 7719011: Move some files from sync/engine to internal_api (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Refresh the diff and remove unintended change Created 9 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
« no previous file with comments | « chrome/browser/sync/internal_api/syncapi_unittest.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <stddef.h> 7 #include <stddef.h>
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/command_line.h" 13 #include "base/command_line.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
17 #include "base/message_loop.h" 17 #include "base/message_loop.h"
18 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
19 #include "base/string16.h" 19 #include "base/string16.h"
20 #include "base/stringprintf.h" 20 #include "base/stringprintf.h"
21 #include "base/task.h" 21 #include "base/task.h"
22 #include "base/threading/thread_restrictions.h" 22 #include "base/threading/thread_restrictions.h"
23 #include "chrome/browser/about_flags.h" 23 #include "chrome/browser/about_flags.h"
24 #include "chrome/browser/browser_process.h" 24 #include "chrome/browser/browser_process.h"
25 #include "chrome/browser/net/chrome_cookie_notification_details.h" 25 #include "chrome/browser/net/chrome_cookie_notification_details.h"
26 #include "chrome/browser/net/gaia/token_service.h" 26 #include "chrome/browser/net/gaia/token_service.h"
27 #include "chrome/browser/prefs/pref_service.h" 27 #include "chrome/browser/prefs/pref_service.h"
28 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/sync/backend_migrator.h" 29 #include "chrome/browser/sync/backend_migrator.h"
30 #include "chrome/browser/sync/engine/configure_reason.h"
31 #include "chrome/browser/sync/glue/change_processor.h" 30 #include "chrome/browser/sync/glue/change_processor.h"
32 #include "chrome/browser/sync/glue/data_type_controller.h" 31 #include "chrome/browser/sync/glue/data_type_controller.h"
33 #include "chrome/browser/sync/glue/session_data_type_controller.h" 32 #include "chrome/browser/sync/glue/session_data_type_controller.h"
34 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" 33 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
35 #include "chrome/browser/sync/glue/data_type_manager.h" 34 #include "chrome/browser/sync/glue/data_type_manager.h"
36 #include "chrome/browser/sync/glue/session_data_type_controller.h" 35 #include "chrome/browser/sync/glue/session_data_type_controller.h"
36 #include "chrome/browser/sync/internal_api/configure_reason.h"
37 #include "chrome/browser/sync/internal_api/sync_manager.h" 37 #include "chrome/browser/sync/internal_api/sync_manager.h"
38 #include "chrome/browser/sync/js/js_arg_list.h" 38 #include "chrome/browser/sync/js/js_arg_list.h"
39 #include "chrome/browser/sync/js/js_event_details.h" 39 #include "chrome/browser/sync/js/js_event_details.h"
40 #include "chrome/browser/sync/profile_sync_factory.h" 40 #include "chrome/browser/sync/profile_sync_factory.h"
41 #include "chrome/browser/sync/signin_manager.h" 41 #include "chrome/browser/sync/signin_manager.h"
42 #include "chrome/browser/sync/util/oauth.h" 42 #include "chrome/browser/sync/util/oauth.h"
43 #include "chrome/browser/ui/browser.h" 43 #include "chrome/browser/ui/browser.h"
44 #include "chrome/browser/ui/browser_list.h" 44 #include "chrome/browser/ui/browser_list.h"
45 #include "chrome/browser/ui/browser_window.h" 45 #include "chrome/browser/ui/browser_window.h"
46 #include "chrome/common/chrome_notification_types.h" 46 #include "chrome/common/chrome_notification_types.h"
(...skipping 1527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1574 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); 1574 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes));
1575 syncable::ModelTypeSet registered; 1575 syncable::ModelTypeSet registered;
1576 GetRegisteredDataTypes(&registered); 1576 GetRegisteredDataTypes(&registered);
1577 syncable::ModelTypeBitSet registered_bit_set = 1577 syncable::ModelTypeBitSet registered_bit_set =
1578 syncable::ModelTypeBitSetFromSet(registered); 1578 syncable::ModelTypeBitSetFromSet(registered);
1579 unacknowledged = registered_bit_set & ~acknowledged; 1579 unacknowledged = registered_bit_set & ~acknowledged;
1580 } 1580 }
1581 return unacknowledged; 1581 return unacknowledged;
1582 } 1582 }
1583 1583
OLDNEW
« no previous file with comments | « chrome/browser/sync/internal_api/syncapi_unittest.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698