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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 void BlimpEngineSession::GetEnginePortForTesting( | 295 void BlimpEngineSession::GetEnginePortForTesting( |
296 const GetPortCallback& callback) { | 296 const GetPortCallback& callback) { |
297 content::BrowserThread::PostTaskAndReplyWithResult( | 297 content::BrowserThread::PostTaskAndReplyWithResult( |
298 content::BrowserThread::IO, FROM_HERE, | 298 content::BrowserThread::IO, FROM_HERE, |
299 base::Bind(&EngineNetworkComponents::GetPortForTesting, | 299 base::Bind(&EngineNetworkComponents::GetPortForTesting, |
300 base::Unretained(net_components_.get())), | 300 base::Unretained(net_components_.get())), |
301 callback); | 301 callback); |
302 } | 302 } |
303 | 303 |
304 void BlimpEngineSession::RegisterFeatures() { | 304 void BlimpEngineSession::RegisterFeatures() { |
305 thread_pipe_manager_.reset(new ThreadPipeManager( | 305 thread_pipe_manager_.reset( |
306 content::BrowserThread::GetMessageLoopProxyForThread( | 306 new ThreadPipeManager(content::BrowserThread::GetTaskRunnerForThread( |
307 content::BrowserThread::IO), | 307 content::BrowserThread::IO), |
308 net_components_->GetBrowserConnectionHandler())); | 308 net_components_->GetBrowserConnectionHandler())); |
309 | 309 |
310 // Register features' message senders and receivers. | 310 // Register features' message senders and receivers. |
311 tab_control_message_sender_ = | 311 tab_control_message_sender_ = |
312 thread_pipe_manager_->RegisterFeature(BlimpMessage::kTabControl, this); | 312 thread_pipe_manager_->RegisterFeature(BlimpMessage::kTabControl, this); |
313 navigation_message_sender_ = | 313 navigation_message_sender_ = |
314 thread_pipe_manager_->RegisterFeature(BlimpMessage::kNavigation, this); | 314 thread_pipe_manager_->RegisterFeature(BlimpMessage::kNavigation, this); |
315 render_widget_feature_.set_render_widget_message_sender( | 315 render_widget_feature_.set_render_widget_message_sender( |
316 thread_pipe_manager_->RegisterFeature(BlimpMessage::kRenderWidget, | 316 thread_pipe_manager_->RegisterFeature(BlimpMessage::kRenderWidget, |
317 &render_widget_feature_)); | 317 &render_widget_feature_)); |
318 render_widget_feature_.set_input_message_sender( | 318 render_widget_feature_.set_input_message_sender( |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
563 parent->AddChild(content); | 563 parent->AddChild(content); |
564 content->Show(); | 564 content->Show(); |
565 | 565 |
566 tab_ = base::WrapUnique(new Tab(std::move(new_contents), target_tab_id, | 566 tab_ = base::WrapUnique(new Tab(std::move(new_contents), target_tab_id, |
567 &render_widget_feature_, | 567 &render_widget_feature_, |
568 navigation_message_sender_.get())); | 568 navigation_message_sender_.get())); |
569 } | 569 } |
570 | 570 |
571 } // namespace engine | 571 } // namespace engine |
572 } // namespace blimp | 572 } // namespace blimp |
OLD | NEW |