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

Unified Diff: blimp/client/session/blimp_client_session.cc

Issue 1687393002: Add assigner support to Blimp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix evil build break? Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « blimp/client/session/blimp_client_session.h ('k') | blimp/common/protocol_version.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/session/blimp_client_session.cc
diff --git a/blimp/client/session/blimp_client_session.cc b/blimp/client/session/blimp_client_session.cc
index e681a0ab8b9fc7f20da2211afdd133627ef56e9d..29c0b32b28703cecc197fbd6a7aa36226a1c4875 100644
--- a/blimp/client/session/blimp_client_session.cc
+++ b/blimp/client/session/blimp_client_session.cc
@@ -10,6 +10,7 @@
#include "base/command_line.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_number_conversions.h"
+#include "base/thread_task_runner_handle.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "blimp/client/app/blimp_client_switches.h"
#include "blimp/client/feature/navigation_feature.h"
@@ -106,10 +107,8 @@ void ClientNetworkComponents::RegisterFeature(
outgoing_message_processors_.push_back(std::move(outgoing_message_processor));
}
-BlimpClientSession::BlimpClientSession(
- scoped_ptr<AssignmentSource> assignment_source)
- : assignment_source_(std::move(assignment_source)),
- io_thread_("BlimpIOThread"),
+BlimpClientSession::BlimpClientSession()
+ : io_thread_("BlimpIOThread"),
tab_control_feature_(new TabControlFeature),
navigation_feature_(new NavigationFeature),
render_widget_feature_(new RenderWidgetFeature),
@@ -119,6 +118,9 @@ BlimpClientSession::BlimpClientSession(
options.message_loop_type = base::MessageLoop::TYPE_IO;
io_thread_.StartWithOptions(options);
+ assignment_source_.reset(new AssignmentSource(
+ base::ThreadTaskRunnerHandle::Get(), io_thread_.task_runner()));
+
// Register features' message senders and receivers.
tab_control_feature_->set_outgoing_message_processor(
RegisterFeature(BlimpMessage::TAB_CONTROL, tab_control_feature_.get()));
@@ -144,18 +146,30 @@ BlimpClientSession::~BlimpClientSession() {
io_thread_.task_runner()->DeleteSoon(FROM_HERE, net_components_.release());
}
-void BlimpClientSession::Connect() {
- assignment_source_->GetAssignment(base::Bind(
- &BlimpClientSession::ConnectWithAssignment, weak_factory_.GetWeakPtr()));
+void BlimpClientSession::Connect(const std::string& client_auth_token) {
+ assignment_source_->GetAssignment(
+ client_auth_token, base::Bind(&BlimpClientSession::ConnectWithAssignment,
+ weak_factory_.GetWeakPtr()));
}
-void BlimpClientSession::ConnectWithAssignment(const Assignment& assignment) {
+void BlimpClientSession::ConnectWithAssignment(AssignmentSource::Result result,
+ const Assignment& assignment) {
+ OnAssignmentConnectionAttempted(result);
+
+ if (result != AssignmentSource::Result::RESULT_OK) {
+ VLOG(1) << "Assignment request failed: " << result;
+ return;
+ }
+
io_thread_.task_runner()->PostTask(
FROM_HERE,
base::Bind(&ClientNetworkComponents::ConnectWithAssignment,
base::Unretained(net_components_.get()), assignment));
}
+void BlimpClientSession::OnAssignmentConnectionAttempted(
+ AssignmentSource::Result result) {}
+
scoped_ptr<BlimpMessageProcessor> BlimpClientSession::RegisterFeature(
BlimpMessage::Type type,
BlimpMessageProcessor* incoming_processor) {
« no previous file with comments | « blimp/client/session/blimp_client_session.h ('k') | blimp/common/protocol_version.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698