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

Side by Side Diff: chrome/browser/sync/engine/syncapi.cc

Issue 7497051: sync: Move all the js_* files into a js/ subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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/README.js ('k') | chrome/browser/sync/engine/syncapi_unittest.cc » ('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/engine/syncapi.h" 5 #include "chrome/browser/sync/engine/syncapi.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <bitset> 8 #include <bitset>
9 #include <iomanip> 9 #include <iomanip>
10 #include <list> 10 #include <list>
(...skipping 16 matching lines...) Expand all
27 #include "base/sha1.h" 27 #include "base/sha1.h"
28 #include "base/string_number_conversions.h" 28 #include "base/string_number_conversions.h"
29 #include "base/string_util.h" 29 #include "base/string_util.h"
30 #include "base/threading/thread_checker.h" 30 #include "base/threading/thread_checker.h"
31 #include "base/time.h" 31 #include "base/time.h"
32 #include "base/tracked.h" 32 #include "base/tracked.h"
33 #include "base/utf_string_conversions.h" 33 #include "base/utf_string_conversions.h"
34 #include "base/values.h" 34 #include "base/values.h"
35 #include "chrome/browser/sync/engine/all_status.h" 35 #include "chrome/browser/sync/engine/all_status.h"
36 #include "chrome/browser/sync/engine/change_reorder_buffer.h" 36 #include "chrome/browser/sync/engine/change_reorder_buffer.h"
37 #include "chrome/browser/sync/engine/http_post_provider_factory.h"
37 #include "chrome/browser/sync/engine/model_safe_worker.h" 38 #include "chrome/browser/sync/engine/model_safe_worker.h"
38 #include "chrome/browser/sync/engine/nudge_source.h"
39 #include "chrome/browser/sync/engine/net/server_connection_manager.h" 39 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
40 #include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h" 40 #include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h"
41 #include "chrome/browser/sync/engine/nudge_source.h"
41 #include "chrome/browser/sync/engine/sync_scheduler.h" 42 #include "chrome/browser/sync/engine/sync_scheduler.h"
42 #include "chrome/browser/sync/engine/syncer.h" 43 #include "chrome/browser/sync/engine/syncer.h"
43 #include "chrome/browser/sync/engine/http_post_provider_factory.h" 44 #include "chrome/browser/sync/js/js_arg_list.h"
44 #include "chrome/browser/sync/js_arg_list.h" 45 #include "chrome/browser/sync/js/js_backend.h"
45 #include "chrome/browser/sync/js_backend.h" 46 #include "chrome/browser/sync/js/js_event_details.h"
46 #include "chrome/browser/sync/js_event_details.h" 47 #include "chrome/browser/sync/js/js_event_handler.h"
47 #include "chrome/browser/sync/js_event_handler.h" 48 #include "chrome/browser/sync/js/js_reply_handler.h"
48 #include "chrome/browser/sync/js_reply_handler.h" 49 #include "chrome/browser/sync/js/js_sync_manager_observer.h"
49 #include "chrome/browser/sync/js_sync_manager_observer.h" 50 #include "chrome/browser/sync/js/js_transaction_observer.h"
50 #include "chrome/browser/sync/js_transaction_observer.h"
51 #include "chrome/browser/sync/notifier/sync_notifier.h" 51 #include "chrome/browser/sync/notifier/sync_notifier.h"
52 #include "chrome/browser/sync/notifier/sync_notifier_observer.h" 52 #include "chrome/browser/sync/notifier/sync_notifier_observer.h"
53 #include "chrome/browser/sync/protocol/app_specifics.pb.h" 53 #include "chrome/browser/sync/protocol/app_specifics.pb.h"
54 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h" 54 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
55 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" 55 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
56 #include "chrome/browser/sync/protocol/extension_specifics.pb.h" 56 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
57 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h" 57 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"
58 #include "chrome/browser/sync/protocol/preference_specifics.pb.h" 58 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
59 #include "chrome/browser/sync/protocol/proto_value_conversions.h" 59 #include "chrome/browser/sync/protocol/proto_value_conversions.h"
60 #include "chrome/browser/sync/protocol/service_constants.h" 60 #include "chrome/browser/sync/protocol/service_constants.h"
61 #include "chrome/browser/sync/protocol/session_specifics.pb.h" 61 #include "chrome/browser/sync/protocol/session_specifics.pb.h"
62 #include "chrome/browser/sync/protocol/sync.pb.h" 62 #include "chrome/browser/sync/protocol/sync.pb.h"
63 #include "chrome/browser/sync/protocol/theme_specifics.pb.h" 63 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"
64 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" 64 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"
65 #include "chrome/browser/sync/sessions/sync_session.h" 65 #include "chrome/browser/sync/sessions/sync_session.h"
66 #include "chrome/browser/sync/sessions/sync_session_context.h" 66 #include "chrome/browser/sync/sessions/sync_session_context.h"
67 #include "chrome/browser/sync/syncable/directory_change_delegate.h" 67 #include "chrome/browser/sync/syncable/directory_change_delegate.h"
68 #include "chrome/browser/sync/syncable/directory_manager.h" 68 #include "chrome/browser/sync/syncable/directory_manager.h"
69 #include "chrome/browser/sync/syncable/model_type.h"
69 #include "chrome/browser/sync/syncable/model_type_payload_map.h" 70 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
70 #include "chrome/browser/sync/syncable/model_type.h"
71 #include "chrome/browser/sync/syncable/nigori_util.h" 71 #include "chrome/browser/sync/syncable/nigori_util.h"
72 #include "chrome/browser/sync/syncable/syncable.h" 72 #include "chrome/browser/sync/syncable/syncable.h"
73 #include "chrome/browser/sync/weak_handle.h" 73 #include "chrome/browser/sync/weak_handle.h"
74 #include "chrome/common/chrome_switches.h" 74 #include "chrome/common/chrome_switches.h"
75 #include "chrome/common/deprecated/event_sys.h" 75 #include "chrome/common/deprecated/event_sys.h"
76 #include "chrome/common/net/gaia/gaia_authenticator.h" 76 #include "chrome/common/net/gaia/gaia_authenticator.h"
77 #include "net/base/network_change_notifier.h" 77 #include "net/base/network_change_notifier.h"
78 78
79 using base::TimeDelta; 79 using base::TimeDelta;
80 using browser_sync::AllStatus; 80 using browser_sync::AllStatus;
(...skipping 2993 matching lines...) Expand 10 before | Expand all | Expand 10 after
3074 void SyncManager::TriggerOnIncomingNotificationForTest( 3074 void SyncManager::TriggerOnIncomingNotificationForTest(
3075 const syncable::ModelTypeBitSet& model_types) { 3075 const syncable::ModelTypeBitSet& model_types) {
3076 syncable::ModelTypePayloadMap model_types_with_payloads = 3076 syncable::ModelTypePayloadMap model_types_with_payloads =
3077 syncable::ModelTypePayloadMapFromBitSet(model_types, 3077 syncable::ModelTypePayloadMapFromBitSet(model_types,
3078 std::string()); 3078 std::string());
3079 3079
3080 data_->OnIncomingNotification(model_types_with_payloads); 3080 data_->OnIncomingNotification(model_types_with_payloads);
3081 } 3081 }
3082 3082
3083 } // namespace sync_api 3083 } // namespace sync_api
OLDNEW
« no previous file with comments | « chrome/browser/sync/README.js ('k') | chrome/browser/sync/engine/syncapi_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698