From 1ffa52f78c8d333a5e32743c2b1bc2daf1267a13 Mon Sep 17 00:00:00 2001 From: kmarshall Date: Wed, 13 Jan 2016 11:38:33 -0800 Subject: Blimp: add some hard-coded actions on client startup. Doing a little bit of work on app startup reduces the need for manual intervention from the developer. BUG= R=dtrainor@chromium.org Review URL: https://codereview.chromium.org/1575493004 Cr-Commit-Position: refs/heads/master@{#369243} --- .../java/src/org/chromium/blimp/BlimpRendererActivity.java | 1 + blimp/client/session/blimp_client_session_android.cc | 8 ++++++++ blimp/net/blimp_message_demultiplexer.cc | 1 + 3 files changed, 10 insertions(+) diff --git a/blimp/client/android/java/src/org/chromium/blimp/BlimpRendererActivity.java b/blimp/client/android/java/src/org/chromium/blimp/BlimpRendererActivity.java index 6641c39..a08407a 100644 --- a/blimp/client/android/java/src/org/chromium/blimp/BlimpRendererActivity.java +++ b/blimp/client/android/java/src/org/chromium/blimp/BlimpRendererActivity.java @@ -124,6 +124,7 @@ public class BlimpRendererActivity extends Activity implements BlimpLibraryLoade mToolbar.initialize(mBlimpClientSession); mTabControlFeature = new TabControlFeature(mBlimpClientSession, mBlimpView); + mToolbar.loadUrl("http://www.google.com/"); } // TokenSource.Callback implementation. diff --git a/blimp/client/session/blimp_client_session_android.cc b/blimp/client/session/blimp_client_session_android.cc index 3a64495..ac515ee 100644 --- a/blimp/client/session/blimp_client_session_android.cc +++ b/blimp/client/session/blimp_client_session_android.cc @@ -4,10 +4,14 @@ #include "blimp/client/session/blimp_client_session_android.h" +#include "blimp/client/session/tab_control_feature.h" #include "jni/BlimpClientSession_jni.h" namespace blimp { namespace client { +namespace { +const int kDummyTabId = 0; +} // namespace static jlong Init(JNIEnv* env, const JavaParamRef& jobj) { return reinterpret_cast(new BlimpClientSessionAndroid(env, jobj)); @@ -31,6 +35,10 @@ BlimpClientSessionAndroid::BlimpClientSessionAndroid( const base::android::JavaParamRef& jobj) : BlimpClientSession() { java_obj_.Reset(env, jobj); + + // Create a single tab's WebContents. + // TODO(kmarshall): Remove this once we add tab-literacy to Blimp. + GetTabControlFeature()->CreateTab(kDummyTabId); } BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {} diff --git a/blimp/net/blimp_message_demultiplexer.cc b/blimp/net/blimp_message_demultiplexer.cc index 8c69702..eb9edff 100644 --- a/blimp/net/blimp_message_demultiplexer.cc +++ b/blimp/net/blimp_message_demultiplexer.cc @@ -39,6 +39,7 @@ void BlimpMessageDemultiplexer::ProcessMessage( return; } + DVLOG(2) << "Routed message " << *message << "."; receiver_iter->second->ProcessMessage(std::move(message), callback); } -- cgit v1.1