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

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

Issue 7587009: sync: add DEPS files to subdirs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix include 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
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 18 matching lines...) Expand all
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/http_post_provider_factory.h"
38 #include "chrome/browser/sync/engine/model_safe_worker.h" 38 #include "chrome/browser/sync/engine/model_safe_worker.h"
39 #include "chrome/browser/sync/engine/nigori_util.h"
40 #include "chrome/browser/sync/engine/nudge_source.h"
39 #include "chrome/browser/sync/engine/net/server_connection_manager.h" 41 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
40 #include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h" 42 #include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h"
41 #include "chrome/browser/sync/engine/nudge_source.h" 43 #include "chrome/browser/sync/engine/nudge_source.h"
42 #include "chrome/browser/sync/engine/sync_scheduler.h" 44 #include "chrome/browser/sync/engine/sync_scheduler.h"
43 #include "chrome/browser/sync/engine/syncer.h" 45 #include "chrome/browser/sync/engine/syncer.h"
44 #include "chrome/browser/sync/js/js_arg_list.h" 46 #include "chrome/browser/sync/js/js_arg_list.h"
45 #include "chrome/browser/sync/js/js_backend.h" 47 #include "chrome/browser/sync/js/js_backend.h"
46 #include "chrome/browser/sync/js/js_event_details.h" 48 #include "chrome/browser/sync/js/js_event_details.h"
47 #include "chrome/browser/sync/js/js_event_handler.h" 49 #include "chrome/browser/sync/js/js_event_handler.h"
48 #include "chrome/browser/sync/js/js_reply_handler.h" 50 #include "chrome/browser/sync/js/js_reply_handler.h"
(...skipping 12 matching lines...) Expand all
61 #include "chrome/browser/sync/protocol/session_specifics.pb.h" 63 #include "chrome/browser/sync/protocol/session_specifics.pb.h"
62 #include "chrome/browser/sync/protocol/sync.pb.h" 64 #include "chrome/browser/sync/protocol/sync.pb.h"
63 #include "chrome/browser/sync/protocol/theme_specifics.pb.h" 65 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"
64 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" 66 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"
65 #include "chrome/browser/sync/sessions/sync_session.h" 67 #include "chrome/browser/sync/sessions/sync_session.h"
66 #include "chrome/browser/sync/sessions/sync_session_context.h" 68 #include "chrome/browser/sync/sessions/sync_session_context.h"
67 #include "chrome/browser/sync/syncable/directory_change_delegate.h" 69 #include "chrome/browser/sync/syncable/directory_change_delegate.h"
68 #include "chrome/browser/sync/syncable/directory_manager.h" 70 #include "chrome/browser/sync/syncable/directory_manager.h"
69 #include "chrome/browser/sync/syncable/model_type.h" 71 #include "chrome/browser/sync/syncable/model_type.h"
70 #include "chrome/browser/sync/syncable/model_type_payload_map.h" 72 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
71 #include "chrome/browser/sync/syncable/nigori_util.h"
72 #include "chrome/browser/sync/syncable/syncable.h" 73 #include "chrome/browser/sync/syncable/syncable.h"
73 #include "chrome/browser/sync/weak_handle.h" 74 #include "chrome/browser/sync/weak_handle.h"
74 #include "chrome/common/chrome_switches.h" 75 #include "chrome/common/chrome_switches.h"
75 #include "chrome/common/deprecated/event_sys.h"
76 #include "chrome/common/net/gaia/gaia_authenticator.h"
77 #include "net/base/network_change_notifier.h" 76 #include "net/base/network_change_notifier.h"
78 77
79 using base::TimeDelta; 78 using base::TimeDelta;
80 using browser_sync::AllStatus; 79 using browser_sync::AllStatus;
81 using browser_sync::Cryptographer; 80 using browser_sync::Cryptographer;
82 using browser_sync::JsArgList; 81 using browser_sync::JsArgList;
83 using browser_sync::JsBackend; 82 using browser_sync::JsBackend;
84 using browser_sync::JsEventDetails; 83 using browser_sync::JsEventDetails;
85 using browser_sync::JsEventHandler; 84 using browser_sync::JsEventHandler;
86 using browser_sync::JsReplyHandler; 85 using browser_sync::JsReplyHandler;
(...skipping 2990 matching lines...) Expand 10 before | Expand all | Expand 10 after
3077 void SyncManager::TriggerOnIncomingNotificationForTest( 3076 void SyncManager::TriggerOnIncomingNotificationForTest(
3078 const syncable::ModelTypeBitSet& model_types) { 3077 const syncable::ModelTypeBitSet& model_types) {
3079 syncable::ModelTypePayloadMap model_types_with_payloads = 3078 syncable::ModelTypePayloadMap model_types_with_payloads =
3080 syncable::ModelTypePayloadMapFromBitSet(model_types, 3079 syncable::ModelTypePayloadMapFromBitSet(model_types,
3081 std::string()); 3080 std::string());
3082 3081
3083 data_->OnIncomingNotification(model_types_with_payloads); 3082 data_->OnIncomingNotification(model_types_with_payloads);
3084 } 3083 }
3085 3084
3086 } // namespace sync_api 3085 } // namespace sync_api
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/nigori_util_unittest.cc ('k') | chrome/browser/sync/engine/syncapi_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698