| 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 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 RegisterFeatures(); | 295 RegisterFeatures(); |
| 296 | 296 |
| 297 // Initialize must only be posted after the RegisterFeature calls have | 297 // Initialize must only be posted after the RegisterFeature calls have |
| 298 // completed. | 298 // completed. |
| 299 content::BrowserThread::PostTask( | 299 content::BrowserThread::PostTask( |
| 300 content::BrowserThread::IO, FROM_HERE, | 300 content::BrowserThread::IO, FROM_HERE, |
| 301 base::Bind(&EngineNetworkComponents::Initialize, | 301 base::Bind(&EngineNetworkComponents::Initialize, |
| 302 base::Unretained(net_components_.get()), | 302 base::Unretained(net_components_.get()), |
| 303 base::ThreadTaskRunnerHandle::Get(), | 303 base::ThreadTaskRunnerHandle::Get(), |
| 304 blob_channel_sender_weak_factory_->GetWeakPtr(), | 304 blob_channel_sender_weak_factory_->GetWeakPtr(), |
| 305 engine_config_->client_token())); | 305 engine_config_->client_auth_token())); |
| 306 } | 306 } |
| 307 | 307 |
| 308 BlobChannelService* BlimpEngineSession::GetBlobChannelService() { | 308 BlobChannelService* BlimpEngineSession::GetBlobChannelService() { |
| 309 return net_components_->blob_channel_service(); | 309 return net_components_->blob_channel_service(); |
| 310 } | 310 } |
| 311 | 311 |
| 312 void BlimpEngineSession::GetEnginePortForTesting( | 312 void BlimpEngineSession::GetEnginePortForTesting( |
| 313 const GetPortCallback& callback) { | 313 const GetPortCallback& callback) { |
| 314 content::BrowserThread::PostTaskAndReplyWithResult( | 314 content::BrowserThread::PostTaskAndReplyWithResult( |
| 315 content::BrowserThread::IO, FROM_HERE, | 315 content::BrowserThread::IO, FROM_HERE, |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 parent->AddChild(content); | 583 parent->AddChild(content); |
| 584 content->Show(); | 584 content->Show(); |
| 585 | 585 |
| 586 tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id, | 586 tab_ = base::MakeUnique<Tab>(std::move(new_contents), target_tab_id, |
| 587 &render_widget_feature_, | 587 &render_widget_feature_, |
| 588 navigation_message_sender_.get()); | 588 navigation_message_sender_.get()); |
| 589 } | 589 } |
| 590 | 590 |
| 591 } // namespace engine | 591 } // namespace engine |
| 592 } // namespace blimp | 592 } // namespace blimp |
| OLD | NEW |