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

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

Issue 1842403003: Added Version Info page to toolbar menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@toolbar_menu
Patch Set: Created 4 years, 9 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
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 fa3a93b58873b19142d6c8a4950240a0670cc527..f3b203cc52f85b7f0ba9b9dbe0cc871180598cb8 100644
--- a/blimp/client/session/blimp_client_session.cc
+++ b/blimp/client/session/blimp_client_session.cc
@@ -17,6 +17,7 @@
#include "blimp/client/feature/render_widget_feature.h"
#include "blimp/client/feature/settings_feature.h"
#include "blimp/client/feature/tab_control_feature.h"
+#include "blimp/common/protocol_version.h"
#include "blimp/net/blimp_connection.h"
#include "blimp/net/blimp_message_processor.h"
#include "blimp/net/blimp_message_thread_pipe.h"
@@ -148,7 +149,8 @@ void ClientNetworkComponents::OnConnectionError(int result) {
}
BlimpClientSession::BlimpClientSession()
- : io_thread_("BlimpIOThread"),
+ : engineVersion_(blimp::kEngineVersion),
+ io_thread_("BlimpIOThread"),
tab_control_feature_(new TabControlFeature),
navigation_feature_(new NavigationFeature),
ime_feature_(new ImeFeature),
@@ -189,6 +191,9 @@ void BlimpClientSession::ConnectWithAssignment(AssignmentSource::Result result,
const Assignment& assignment) {
OnAssignmentConnectionAttempted(result);
+ engineIPAddress_ = IPAddressToStringWithPort(
+ assignment.engine_endpoint.address(), assignment.engine_endpoint.port());
+
if (result != AssignmentSource::Result::RESULT_OK) {
VLOG(1) << "Assignment request failed: " << result;
return;
« blimp/client/session/blimp_client_session.h ('K') | « blimp/client/session/blimp_client_session.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698