| 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/client/session/blimp_client_session.h" | 5 #include "blimp/client/session/blimp_client_session.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 } | 183 } |
| 184 | 184 |
| 185 void BlimpClientSession::Connect(const std::string& client_auth_token) { | 185 void BlimpClientSession::Connect(const std::string& client_auth_token) { |
| 186 assignment_source_->GetAssignment( | 186 assignment_source_->GetAssignment( |
| 187 client_auth_token, base::Bind(&BlimpClientSession::ConnectWithAssignment, | 187 client_auth_token, base::Bind(&BlimpClientSession::ConnectWithAssignment, |
| 188 weak_factory_.GetWeakPtr())); | 188 weak_factory_.GetWeakPtr())); |
| 189 } | 189 } |
| 190 | 190 |
| 191 void BlimpClientSession::ConnectWithAssignment(AssignmentSource::Result result, | 191 void BlimpClientSession::ConnectWithAssignment(AssignmentSource::Result result, |
| 192 const Assignment& assignment) { | 192 const Assignment& assignment) { |
| 193 OnAssignmentConnectionAttempted(result); | 193 OnAssignmentConnectionAttempted(result, assignment); |
| 194 | 194 |
| 195 if (result != AssignmentSource::Result::RESULT_OK) { | 195 if (result != AssignmentSource::Result::RESULT_OK) { |
| 196 VLOG(1) << "Assignment request failed: " << result; | 196 VLOG(1) << "Assignment request failed: " << result; |
| 197 return; | 197 return; |
| 198 } | 198 } |
| 199 | 199 |
| 200 io_thread_.task_runner()->PostTask( | 200 io_thread_.task_runner()->PostTask( |
| 201 FROM_HERE, | 201 FROM_HERE, |
| 202 base::Bind(&ClientNetworkComponents::ConnectWithAssignment, | 202 base::Bind(&ClientNetworkComponents::ConnectWithAssignment, |
| 203 base::Unretained(net_components_.get()), assignment)); | 203 base::Unretained(net_components_.get()), assignment)); |
| 204 } | 204 } |
| 205 | 205 |
| 206 void BlimpClientSession::OnAssignmentConnectionAttempted( | 206 void BlimpClientSession::OnAssignmentConnectionAttempted( |
| 207 AssignmentSource::Result result) {} | 207 AssignmentSource::Result result, |
| 208 const Assignment& assignment) {} |
| 208 | 209 |
| 209 void BlimpClientSession::RegisterFeatures() { | 210 void BlimpClientSession::RegisterFeatures() { |
| 210 thread_pipe_manager_ = base::WrapUnique(new ThreadPipeManager( | 211 thread_pipe_manager_ = base::WrapUnique(new ThreadPipeManager( |
| 211 io_thread_.task_runner(), base::SequencedTaskRunnerHandle::Get(), | 212 io_thread_.task_runner(), base::SequencedTaskRunnerHandle::Get(), |
| 212 net_components_->GetBrowserConnectionHandler())); | 213 net_components_->GetBrowserConnectionHandler())); |
| 213 | 214 |
| 214 // Register features' message senders and receivers. | 215 // Register features' message senders and receivers. |
| 215 tab_control_feature_->set_outgoing_message_processor( | 216 tab_control_feature_->set_outgoing_message_processor( |
| 216 thread_pipe_manager_->RegisterFeature(BlimpMessage::TAB_CONTROL, | 217 thread_pipe_manager_->RegisterFeature(BlimpMessage::TAB_CONTROL, |
| 217 tab_control_feature_.get())); | 218 tab_control_feature_.get())); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 RenderWidgetFeature* BlimpClientSession::GetRenderWidgetFeature() const { | 262 RenderWidgetFeature* BlimpClientSession::GetRenderWidgetFeature() const { |
| 262 return render_widget_feature_.get(); | 263 return render_widget_feature_.get(); |
| 263 } | 264 } |
| 264 | 265 |
| 265 SettingsFeature* BlimpClientSession::GetSettingsFeature() const { | 266 SettingsFeature* BlimpClientSession::GetSettingsFeature() const { |
| 266 return settings_feature_.get(); | 267 return settings_feature_.get(); |
| 267 } | 268 } |
| 268 | 269 |
| 269 } // namespace client | 270 } // namespace client |
| 270 } // namespace blimp | 271 } // namespace blimp |
| OLD | NEW |