OLD | NEW |
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/notifier/sync_notifier_factory.h" | 5 #include "chrome/browser/sync/notifier/sync_notifier_factory.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/string_number_conversions.h" | 11 #include "base/string_number_conversions.h" |
12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
13 #include "chrome/browser/sync/notifier/bridged_sync_notifier.h" | |
14 #include "chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h" | 13 #include "chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h" |
15 #include "chrome/browser/sync/notifier/p2p_notifier.h" | 14 #include "chrome/browser/sync/notifier/p2p_notifier.h" |
16 #include "chrome/browser/sync/notifier/sync_notifier.h" | 15 #include "chrome/browser/sync/notifier/sync_notifier.h" |
17 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
18 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
19 #include "jingle/notifier/base/const_communicator.h" | 18 #include "jingle/notifier/base/const_communicator.h" |
20 #include "jingle/notifier/base/notifier_options.h" | 19 #include "jingle/notifier/base/notifier_options.h" |
21 #include "jingle/notifier/listener/mediator_thread_impl.h" | 20 #include "jingle/notifier/listener/mediator_thread_impl.h" |
22 #include "jingle/notifier/listener/talk_mediator_impl.h" | 21 #include "jingle/notifier/listener/talk_mediator_impl.h" |
23 #include "net/base/host_port_pair.h" | 22 #include "net/base/host_port_pair.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 } | 111 } |
113 | 112 |
114 return new NonBlockingInvalidationNotifier( | 113 return new NonBlockingInvalidationNotifier( |
115 notifier_options, initial_max_invalidation_versions, | 114 notifier_options, initial_max_invalidation_versions, |
116 invalidation_version_tracker, client_info); | 115 invalidation_version_tracker, client_info); |
117 } | 116 } |
118 | 117 |
119 } // namespace | 118 } // namespace |
120 | 119 |
121 SyncNotifierFactory::SyncNotifierFactory( | 120 SyncNotifierFactory::SyncNotifierFactory( |
122 const Profile* profile, | |
123 const std::string& client_info, | 121 const std::string& client_info, |
124 const scoped_refptr<net::URLRequestContextGetter>& | 122 const scoped_refptr<net::URLRequestContextGetter>& |
125 request_context_getter, | 123 request_context_getter, |
126 const base::WeakPtr<InvalidationVersionTracker>& | 124 const base::WeakPtr<InvalidationVersionTracker>& |
127 invalidation_version_tracker, | 125 invalidation_version_tracker, |
128 const CommandLine& command_line) | 126 const CommandLine& command_line) |
129 : chrome_notification_bridge_(profile), | 127 : client_info_(client_info), |
130 client_info_(client_info), | |
131 request_context_getter_(request_context_getter), | 128 request_context_getter_(request_context_getter), |
132 initial_max_invalidation_versions_( | 129 initial_max_invalidation_versions_( |
133 invalidation_version_tracker.get() ? | 130 invalidation_version_tracker.get() ? |
134 invalidation_version_tracker->GetAllMaxVersions() : | 131 invalidation_version_tracker->GetAllMaxVersions() : |
135 InvalidationVersionMap()), | 132 InvalidationVersionMap()), |
136 invalidation_version_tracker_(invalidation_version_tracker), | 133 invalidation_version_tracker_(invalidation_version_tracker), |
137 command_line_(command_line) { | 134 command_line_(command_line) { |
138 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 135 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
139 DCHECK(profile); | |
140 } | 136 } |
141 | 137 |
142 SyncNotifierFactory::~SyncNotifierFactory() { | 138 SyncNotifierFactory::~SyncNotifierFactory() { |
143 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 139 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
144 } | 140 } |
145 | 141 |
146 SyncNotifier* SyncNotifierFactory::CreateSyncNotifier() { | 142 SyncNotifier* SyncNotifierFactory::CreateSyncNotifier() { |
147 return new BridgedSyncNotifier( | 143 return CreateDefaultSyncNotifier(command_line_, |
148 &chrome_notification_bridge_, | 144 request_context_getter_, |
149 CreateDefaultSyncNotifier(command_line_, | 145 initial_max_invalidation_versions_, |
150 request_context_getter_, | 146 invalidation_version_tracker_, |
151 initial_max_invalidation_versions_, | 147 client_info_); |
152 invalidation_version_tracker_, | |
153 client_info_)); | |
154 } | 148 } |
155 } // namespace sync_notifier | 149 } // namespace sync_notifier |
OLD | NEW |