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/engine/session/blimp_engine_session.h" | 5 #include "blimp/engine/session/blimp_engine_session.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/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
13 #include "base/thread_task_runner_handle.h" | 13 #include "base/thread_task_runner_handle.h" |
14 #include "base/trace_event/trace_event.h" | 14 #include "base/trace_event/trace_event.h" |
15 #include "blimp/common/create_blimp_message.h" | 15 #include "blimp/common/create_blimp_message.h" |
16 #include "blimp/common/proto/tab_control.pb.h" | 16 #include "blimp/common/proto/tab_control.pb.h" |
17 #include "blimp/engine/app/blimp_engine_config.h" | 17 #include "blimp/engine/app/blimp_engine_config.h" |
18 #include "blimp/engine/app/settings_manager.h" | 18 #include "blimp/engine/app/settings_manager.h" |
19 #include "blimp/engine/app/switches.h" | 19 #include "blimp/engine/app/switches.h" |
20 #include "blimp/engine/app/ui/blimp_layout_manager.h" | 20 #include "blimp/engine/app/ui/blimp_layout_manager.h" |
21 #include "blimp/engine/app/ui/blimp_screen.h" | 21 #include "blimp/engine/app/ui/blimp_screen.h" |
22 #include "blimp/engine/app/ui/blimp_window_tree_client.h" | 22 #include "blimp/engine/app/ui/blimp_window_tree_client.h" |
23 #include "blimp/engine/app/ui/blimp_window_tree_host.h" | 23 #include "blimp/engine/app/ui/blimp_window_tree_host.h" |
24 #include "blimp/engine/common/blimp_browser_context.h" | 24 #include "blimp/engine/common/blimp_browser_context.h" |
25 #include "blimp/net/blimp_connection.h" | 25 #include "blimp/net/blimp_connection.h" |
| 26 #include "blimp/net/blimp_connection_details.h" |
26 #include "blimp/net/blimp_message_multiplexer.h" | 27 #include "blimp/net/blimp_message_multiplexer.h" |
27 #include "blimp/net/blimp_message_thread_pipe.h" | 28 #include "blimp/net/blimp_message_thread_pipe.h" |
28 #include "blimp/net/browser_connection_handler.h" | 29 #include "blimp/net/browser_connection_handler.h" |
29 #include "blimp/net/common.h" | 30 #include "blimp/net/common.h" |
30 #include "blimp/net/engine_authentication_handler.h" | 31 #include "blimp/net/engine_authentication_handler.h" |
31 #include "blimp/net/engine_connection_manager.h" | 32 #include "blimp/net/engine_connection_manager.h" |
32 #include "blimp/net/null_blimp_message_processor.h" | 33 #include "blimp/net/null_blimp_message_processor.h" |
33 #include "blimp/net/tcp_engine_transport.h" | 34 #include "blimp/net/tcp_engine_transport.h" |
34 #include "blimp/net/thread_pipe_manager.h" | 35 #include "blimp/net/thread_pipe_manager.h" |
35 #include "content/public/browser/browser_context.h" | 36 #include "content/public/browser/browser_context.h" |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 // Adds BlimpTransports to connection_manager_. | 178 // Adds BlimpTransports to connection_manager_. |
178 net::IPEndPoint address(GetIPv4AnyAddress(), GetListeningPort()); | 179 net::IPEndPoint address(GetIPv4AnyAddress(), GetListeningPort()); |
179 connection_manager_->AddTransport( | 180 connection_manager_->AddTransport( |
180 base::WrapUnique(new TCPEngineTransport(address, net_log_))); | 181 base::WrapUnique(new TCPEngineTransport(address, net_log_))); |
181 } | 182 } |
182 | 183 |
183 void EngineNetworkComponents::HandleConnection( | 184 void EngineNetworkComponents::HandleConnection( |
184 std::unique_ptr<BlimpConnection> connection) { | 185 std::unique_ptr<BlimpConnection> connection) { |
185 // Observe |connection| for disconnection events. | 186 // Observe |connection| for disconnection events. |
186 connection->AddConnectionErrorObserver(this); | 187 connection->AddConnectionErrorObserver(this); |
| 188 connection->SetBlimpConnectionDetails(new BlimpConnectionDetails(nullptr)); |
187 connection_handler_->HandleConnection(std::move(connection)); | 189 connection_handler_->HandleConnection(std::move(connection)); |
188 } | 190 } |
189 | 191 |
190 void EngineNetworkComponents::OnConnectionError(int error) { | 192 void EngineNetworkComponents::OnConnectionError(int error) { |
191 DVLOG(1) << "EngineNetworkComponents::OnConnectionError(" << error << ")"; | 193 DVLOG(1) << "EngineNetworkComponents::OnConnectionError(" << error << ")"; |
192 quit_closure_.Run(); | 194 quit_closure_.Run(); |
193 } | 195 } |
194 | 196 |
195 BrowserConnectionHandler* | 197 BrowserConnectionHandler* |
196 EngineNetworkComponents::GetBrowserConnectionHandler() { | 198 EngineNetworkComponents::GetBrowserConnectionHandler() { |
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
634 | 636 |
635 aura::Window* parent = window_tree_host_->window(); | 637 aura::Window* parent = window_tree_host_->window(); |
636 aura::Window* content = web_contents_->GetNativeView(); | 638 aura::Window* content = web_contents_->GetNativeView(); |
637 if (!parent->Contains(content)) | 639 if (!parent->Contains(content)) |
638 parent->AddChild(content); | 640 parent->AddChild(content); |
639 content->Show(); | 641 content->Show(); |
640 } | 642 } |
641 | 643 |
642 } // namespace engine | 644 } // namespace engine |
643 } // namespace blimp | 645 } // namespace blimp |
OLD | NEW |