OLD | NEW |
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/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/non_blocking_invalidation_notifier.h" | 13 #include "chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h" |
14 #include "chrome/browser/sync/notifier/p2p_notifier.h" | 14 #include "chrome/browser/sync/notifier/p2p_notifier.h" |
15 #include "chrome/browser/sync/notifier/sync_notifier.h" | 15 #include "chrome/browser/sync/notifier/sync_notifier.h" |
16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
17 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
18 #include "jingle/notifier/base/const_communicator.h" | 18 #include "jingle/notifier/base/const_communicator.h" |
19 #include "jingle/notifier/base/notifier_options.h" | 19 #include "jingle/notifier/base/notifier_options.h" |
20 #include "jingle/notifier/listener/mediator_thread_impl.h" | 20 #include "jingle/notifier/listener/mediator_thread_impl.h" |
21 #include "jingle/notifier/listener/talk_mediator_impl.h" | 21 #include "jingle/notifier/listener/talk_mediator_impl.h" |
22 #include "net/base/host_port_pair.h" | 22 #include "net/base/host_port_pair.h" |
23 | 23 |
| 24 using content::BrowserThread; |
| 25 |
24 namespace sync_notifier { | 26 namespace sync_notifier { |
25 namespace { | 27 namespace { |
26 | 28 |
27 // TODO(akalin): Figure out whether this should be a method of | 29 // TODO(akalin): Figure out whether this should be a method of |
28 // HostPortPair. | 30 // HostPortPair. |
29 net::HostPortPair StringToHostPortPair(const std::string& host_port_str, | 31 net::HostPortPair StringToHostPortPair(const std::string& host_port_str, |
30 uint16 default_port) { | 32 uint16 default_port) { |
31 std::string::size_type colon_index = host_port_str.find(':'); | 33 std::string::size_type colon_index = host_port_str.find(':'); |
32 if (colon_index == std::string::npos) { | 34 if (colon_index == std::string::npos) { |
33 return net::HostPortPair(host_port_str, default_port); | 35 return net::HostPortPair(host_port_str, default_port); |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 } | 139 } |
138 | 140 |
139 SyncNotifier* SyncNotifierFactory::CreateSyncNotifier() { | 141 SyncNotifier* SyncNotifierFactory::CreateSyncNotifier() { |
140 return CreateDefaultSyncNotifier(command_line_, | 142 return CreateDefaultSyncNotifier(command_line_, |
141 request_context_getter_, | 143 request_context_getter_, |
142 initial_max_invalidation_versions_, | 144 initial_max_invalidation_versions_, |
143 invalidation_version_tracker_, | 145 invalidation_version_tracker_, |
144 client_info_); | 146 client_info_); |
145 } | 147 } |
146 } // namespace sync_notifier | 148 } // namespace sync_notifier |
OLD | NEW |