Chromium Code Reviews| 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" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 182 connection_manager_->AddTransport(base::WrapUnique(transport)); | 182 connection_manager_->AddTransport(base::WrapUnique(transport)); |
| 183 | 183 |
| 184 transport->GetLocalAddress(&address); | 184 transport->GetLocalAddress(&address); |
| 185 port_ = address.port(); | 185 port_ = address.port(); |
| 186 } | 186 } |
| 187 | 187 |
| 188 void EngineNetworkComponents::HandleConnection( | 188 void EngineNetworkComponents::HandleConnection( |
| 189 std::unique_ptr<BlimpConnection> connection) { | 189 std::unique_ptr<BlimpConnection> connection) { |
| 190 // Observe |connection| for disconnection events. | 190 // Observe |connection| for disconnection events. |
| 191 connection->AddConnectionErrorObserver(this); | 191 connection->AddConnectionErrorObserver(this); |
| 192 connection->SetBlimpConnectionDetails(nullptr); | |
|
Khushal
2016/05/18 00:23:00
Don't really need to do this here. They already ha
shaktisahu
2016/05/19 21:39:18
Done.
| |
| 192 connection_handler_->HandleConnection(std::move(connection)); | 193 connection_handler_->HandleConnection(std::move(connection)); |
| 193 } | 194 } |
| 194 | 195 |
| 195 void EngineNetworkComponents::OnConnectionError(int error) { | 196 void EngineNetworkComponents::OnConnectionError(int error) { |
| 196 DVLOG(1) << "EngineNetworkComponents::OnConnectionError(" << error << ")"; | 197 DVLOG(1) << "EngineNetworkComponents::OnConnectionError(" << error << ")"; |
| 197 quit_closure_.Run(); | 198 quit_closure_.Run(); |
| 198 } | 199 } |
| 199 | 200 |
| 200 BrowserConnectionHandler* | 201 BrowserConnectionHandler* |
| 201 EngineNetworkComponents::GetBrowserConnectionHandler() { | 202 EngineNetworkComponents::GetBrowserConnectionHandler() { |
| (...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 648 | 649 |
| 649 aura::Window* parent = window_tree_host_->window(); | 650 aura::Window* parent = window_tree_host_->window(); |
| 650 aura::Window* content = web_contents_->GetNativeView(); | 651 aura::Window* content = web_contents_->GetNativeView(); |
| 651 if (!parent->Contains(content)) | 652 if (!parent->Contains(content)) |
| 652 parent->AddChild(content); | 653 parent->AddChild(content); |
| 653 content->Show(); | 654 content->Show(); |
| 654 } | 655 } |
| 655 | 656 |
| 656 } // namespace engine | 657 } // namespace engine |
| 657 } // namespace blimp | 658 } // namespace blimp |
| OLD | NEW |