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