Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: blimp/engine/session/blimp_engine_session.cc

Issue 2281783002: Changes client_token to be client_auth_token. (Closed)
Patch Set: Linting. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « blimp/engine/browser_tests/blimp_browser_test.cc ('k') | blimp/net/client_connection_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « blimp/engine/browser_tests/blimp_browser_test.cc ('k') | blimp/net/client_connection_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698