OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "blimp/client/session/blimp_client_session.h" | 5 #include "blimp/client/session/blimp_client_session.h" |
6 | 6 |
7 #include "base/threading/sequenced_task_runner_handle.h" | 7 #include "base/threading/sequenced_task_runner_handle.h" |
8 #include "blimp/client/session/navigation_feature.h" | 8 #include "blimp/client/session/navigation_feature.h" |
9 #include "blimp/client/session/render_widget_feature.h" | 9 #include "blimp/client/session/render_widget_feature.h" |
10 #include "blimp/client/session/tab_control_feature.h" | 10 #include "blimp/client/session/tab_control_feature.h" |
11 #include "blimp/net/blimp_message_processor.h" | 11 #include "blimp/net/blimp_message_processor.h" |
12 #include "blimp/net/blimp_message_thread_pipe.h" | 12 #include "blimp/net/blimp_message_thread_pipe.h" |
13 #include "blimp/net/browser_connection_handler.h" | 13 #include "blimp/net/browser_connection_handler.h" |
14 #include "blimp/net/client_connection_manager.h" | 14 #include "blimp/net/client_connection_manager.h" |
15 #include "blimp/net/common.h" | 15 #include "blimp/net/common.h" |
16 #include "blimp/net/null_blimp_message_processor.h" | 16 #include "blimp/net/null_blimp_message_processor.h" |
17 #include "blimp/net/tcp_client_transport.h" | 17 #include "blimp/net/tcp_client_transport.h" |
18 | 18 |
19 namespace blimp { | 19 namespace blimp { |
| 20 namespace client { |
20 namespace { | 21 namespace { |
21 | 22 |
22 // TODO(kmarshall): Take values from configuration data. | 23 // TODO(kmarshall): Take values from configuration data. |
23 const char kDummyClientToken[] = "MyVoiceIsMyPassport"; | 24 const char kDummyClientToken[] = "MyVoiceIsMyPassport"; |
24 const uint16_t kDefaultTcpPort = 25467; | 25 const uint16_t kDefaultTcpPort = 25467; |
25 | 26 |
26 net::IPAddressNumber GetEndpointIPAddress() { | 27 net::IPAddressNumber GetEndpointIPAddress() { |
27 // Just connect to localhost for now. | 28 // Just connect to localhost for now. |
28 // TODO(kmarshall): Take IP address from configuration data. | 29 // TODO(kmarshall): Take IP address from configuration data. |
29 net::IPAddressNumber output; | 30 net::IPAddressNumber output; |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 } | 176 } |
176 | 177 |
177 NavigationFeature* BlimpClientSession::GetNavigationFeature() const { | 178 NavigationFeature* BlimpClientSession::GetNavigationFeature() const { |
178 return navigation_feature_.get(); | 179 return navigation_feature_.get(); |
179 } | 180 } |
180 | 181 |
181 RenderWidgetFeature* BlimpClientSession::GetRenderWidgetFeature() const { | 182 RenderWidgetFeature* BlimpClientSession::GetRenderWidgetFeature() const { |
182 return render_widget_feature_.get(); | 183 return render_widget_feature_.get(); |
183 } | 184 } |
184 | 185 |
| 186 } // namespace client |
185 } // namespace blimp | 187 } // namespace blimp |
OLD | NEW |