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

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

Issue 2885005: Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp. (Closed) Base URL: git://codf21.jail.google.com/chromium.git
Patch Set: rebased Created 10 years, 5 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
« no previous file with comments | « chrome/browser/sync/engine/all_status.cc ('k') | chrome/browser/sync/engine/syncer_thread.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include <iomanip> 9 #include <iomanip>
10 #include <list> 10 #include <list>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chrome/browser/sync/syncable/directory_manager.h" 47 #include "chrome/browser/sync/syncable/directory_manager.h"
48 #include "chrome/browser/sync/syncable/syncable.h" 48 #include "chrome/browser/sync/syncable/syncable.h"
49 #include "chrome/browser/sync/util/character_set_converters.h" 49 #include "chrome/browser/sync/util/character_set_converters.h"
50 #include "chrome/browser/sync/util/closure.h" 50 #include "chrome/browser/sync/util/closure.h"
51 #include "chrome/browser/sync/util/crypto_helpers.h" 51 #include "chrome/browser/sync/util/crypto_helpers.h"
52 #include "chrome/browser/sync/util/path_helpers.h" 52 #include "chrome/browser/sync/util/path_helpers.h"
53 #include "chrome/browser/sync/util/user_settings.h" 53 #include "chrome/browser/sync/util/user_settings.h"
54 #include "chrome/common/chrome_switches.h" 54 #include "chrome/common/chrome_switches.h"
55 #include "chrome/common/deprecated/event_sys.h" 55 #include "chrome/common/deprecated/event_sys.h"
56 #include "chrome/common/net/gaia/gaia_authenticator.h" 56 #include "chrome/common/net/gaia/gaia_authenticator.h"
57 #include "chrome/common/net/notifier/listener/mediator_thread_impl.h" 57 #include "jingle/notifier/listener/mediator_thread_impl.h"
58 #include "chrome/common/net/notifier/listener/notification_constants.h" 58 #include "jingle/notifier/listener/notification_constants.h"
59 #include "chrome/common/net/notifier/listener/talk_mediator.h" 59 #include "jingle/notifier/listener/talk_mediator.h"
60 #include "chrome/common/net/notifier/listener/talk_mediator_impl.h" 60 #include "jingle/notifier/listener/talk_mediator_impl.h"
61 #include "net/base/network_change_notifier.h" 61 #include "net/base/network_change_notifier.h"
62 62
63 using browser_sync::AllStatus; 63 using browser_sync::AllStatus;
64 using browser_sync::AllStatusEvent; 64 using browser_sync::AllStatusEvent;
65 using browser_sync::AuthWatcher; 65 using browser_sync::AuthWatcher;
66 using browser_sync::AuthWatcherEvent; 66 using browser_sync::AuthWatcherEvent;
67 using browser_sync::Cryptographer; 67 using browser_sync::Cryptographer;
68 using browser_sync::KeyParams; 68 using browser_sync::KeyParams;
69 using browser_sync::ModelSafeRoutingInfo; 69 using browser_sync::ModelSafeRoutingInfo;
70 using browser_sync::ModelSafeWorker; 70 using browser_sync::ModelSafeWorker;
(...skipping 2044 matching lines...) Expand 10 before | Expand all | Expand 10 after
2115 UserShare* SyncManager::GetUserShare() const { 2115 UserShare* SyncManager::GetUserShare() const {
2116 DCHECK(data_->initialized()) << "GetUserShare requires initialization!"; 2116 DCHECK(data_->initialized()) << "GetUserShare requires initialization!";
2117 return data_->GetUserShare(); 2117 return data_->GetUserShare();
2118 } 2118 }
2119 2119
2120 SyncManager::ExtraAutofillChangeRecordData::~ExtraAutofillChangeRecordData() { 2120 SyncManager::ExtraAutofillChangeRecordData::~ExtraAutofillChangeRecordData() {
2121 delete pre_deletion_data; 2121 delete pre_deletion_data;
2122 } 2122 }
2123 2123
2124 } // namespace sync_api 2124 } // namespace sync_api
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/all_status.cc ('k') | chrome/browser/sync/engine/syncer_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698