Added Version Info page to toolbar menu

blimp/client/app/android/blimp_client_session_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/client/app/android/blimp_client_session_android.h"
 
 #include <string>
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/thread_task_runner_handle.h"
 #include "blimp/client/app/user_agent.h"
 #include "blimp/client/feature/settings_feature.h"
 #include "blimp/client/feature/tab_control_feature.h"
 #include "blimp/client/session/assignment_source.h"
+#include "blimp/common/protocol_version.h"
 #include "jni/BlimpClientSession_jni.h"
 #include "net/base/net_errors.h"
 
 namespace blimp {
 namespace client {
 namespace {
 const int kDummyTabId = 0;
 
 GURL CreateAssignerGURL(const std::string& assigner_url) {
   GURL parsed_url(assigner_url);
@@ skipping 65 matching lines @@
       env, java_obj_.obj(), base::android::ConvertUTF8ToJavaString(
           env, net::ErrorToShortString(result)).obj());
 }
 
 void BlimpClientSessionAndroid::Destroy(JNIEnv* env,
                                         const JavaParamRef<jobject>& jobj) {
   delete this;
 }
 
 void BlimpClientSessionAndroid::OnAssignmentConnectionAttempted(
-    AssignmentSource::Result result) {
+    AssignmentSource::Result result,
+    const Assignment& assignment) {
   // Notify the front end of the assignment result.
+  std::string engine_ip = IPAddressToStringWithPort(
+      assignment.engine_endpoint.address(), assignment.engine_endpoint.port());
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_BlimpClientSession_onAssignmentReceived(env, java_obj_.obj(),
-                                               static_cast<jint>(result));
+  Java_BlimpClientSession_onAssignmentReceived(
+      env, java_obj_.obj(), static_cast<jint>(result),
+      base::android::ConvertUTF8ToJavaString(env, engine_ip).obj(),
+      base::android::ConvertUTF8ToJavaString(env, blimp::kEngineVersion).obj());
 
-  BlimpClientSession::OnAssignmentConnectionAttempted(result);
+  BlimpClientSession::OnAssignmentConnectionAttempted(result, assignment);
 }
 
 }  // namespace client
 }  // namespace blimp