| 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 <string> |
| 8 #include <vector> |
| 9 |
| 7 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 8 #include "base/numerics/safe_conversions.h" | 11 #include "base/numerics/safe_conversions.h" |
| 9 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/threading/sequenced_task_runner_handle.h" | 13 #include "base/threading/sequenced_task_runner_handle.h" |
| 11 #include "blimp/client/blimp_client_switches.h" | 14 #include "blimp/client/app/blimp_client_switches.h" |
| 12 #include "blimp/client/session/navigation_feature.h" | 15 #include "blimp/client/feature/navigation_feature.h" |
| 13 #include "blimp/client/session/render_widget_feature.h" | 16 #include "blimp/client/feature/render_widget_feature.h" |
| 14 #include "blimp/client/session/tab_control_feature.h" | 17 #include "blimp/client/feature/tab_control_feature.h" |
| 15 #include "blimp/net/blimp_message_processor.h" | 18 #include "blimp/net/blimp_message_processor.h" |
| 16 #include "blimp/net/blimp_message_thread_pipe.h" | 19 #include "blimp/net/blimp_message_thread_pipe.h" |
| 17 #include "blimp/net/browser_connection_handler.h" | 20 #include "blimp/net/browser_connection_handler.h" |
| 18 #include "blimp/net/client_connection_manager.h" | 21 #include "blimp/net/client_connection_manager.h" |
| 19 #include "blimp/net/common.h" | 22 #include "blimp/net/common.h" |
| 20 #include "blimp/net/null_blimp_message_processor.h" | 23 #include "blimp/net/null_blimp_message_processor.h" |
| 21 #include "blimp/net/tcp_client_transport.h" | 24 #include "blimp/net/tcp_client_transport.h" |
| 22 #include "net/base/address_list.h" | 25 #include "net/base/address_list.h" |
| 23 #include "net/base/ip_address.h" | 26 #include "net/base/ip_address.h" |
| 24 #include "net/base/ip_endpoint.h" | 27 #include "net/base/ip_endpoint.h" |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 RenderWidgetFeature* BlimpClientSession::GetRenderWidgetFeature() const { | 219 RenderWidgetFeature* BlimpClientSession::GetRenderWidgetFeature() const { |
| 217 return render_widget_feature_.get(); | 220 return render_widget_feature_.get(); |
| 218 } | 221 } |
| 219 | 222 |
| 220 net::IPEndPoint BlimpClientSession::GetBlimpletIPEndpoint() { | 223 net::IPEndPoint BlimpClientSession::GetBlimpletIPEndpoint() { |
| 221 return net::IPEndPoint(GetBlimpletIPAddress(), GetBlimpletTCPPort()); | 224 return net::IPEndPoint(GetBlimpletIPAddress(), GetBlimpletTCPPort()); |
| 222 } | 225 } |
| 223 | 226 |
| 224 } // namespace client | 227 } // namespace client |
| 225 } // namespace blimp | 228 } // namespace blimp |
| OLD | NEW |