Move Java Blimp shell code to app subpackage

blimp/client/app/android/java/src/org/chromium/blimp/app/BlimpRendererActivity.java

 // 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.
 
-package org.chromium.blimp;
+package org.chromium.blimp.app;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.ProcessInitException;
-import org.chromium.blimp.auth.RetryingTokenSource;
-import org.chromium.blimp.auth.TokenSource;
-import org.chromium.blimp.auth.TokenSourceImpl;
+import org.chromium.blimp.app.auth.RetryingTokenSource;
+import org.chromium.blimp.app.auth.TokenSource;
+import org.chromium.blimp.app.auth.TokenSourceImpl;
+import org.chromium.blimp.app.preferences.PreferencesUtil;
+import org.chromium.blimp.app.session.BlimpClientSession;
+import org.chromium.blimp.app.session.EngineInfo;
+import org.chromium.blimp.app.session.TabControlFeature;
+import org.chromium.blimp.app.toolbar.Toolbar;
+import org.chromium.blimp.app.toolbar.ToolbarMenu;
 import org.chromium.blimp.core.BlimpClientSwitches;
-import org.chromium.blimp.preferences.PreferencesUtil;
-import org.chromium.blimp.session.BlimpClientSession;
-import org.chromium.blimp.session.EngineInfo;
-import org.chromium.blimp.session.TabControlFeature;
-import org.chromium.blimp.toolbar.Toolbar;
-import org.chromium.blimp.toolbar.ToolbarMenu;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.widget.Toast;
 
 /**
  * The {@link Activity} for rendering the main Blimp client.  This loads the Blimp rendering stack
  * and displays it.
  */
 public class BlimpRendererActivity
         extends Activity implements BlimpLibraryLoader.Callback, TokenSource.Callback,
                                     BlimpClientSession.ConnectionObserver,
                                     ToolbarMenu.ToolbarMenuDelegate, Toolbar.ToolbarDelegate {
     private static final int ACCOUNT_CHOOSER_INTENT_REQUEST_CODE = 100;
-    private static final String TAG = "BlimpRendererActivity";
+    private static final String TAG = "BlimpRendActivity";
 
     // Refresh interval for the debug view in milliseconds.
     private static final int DEBUG_VIEW_REFRESH_INTERVAL = 1000;
     private static final int BYTES_PER_KILO = 1024;
 
     /** Provides user authentication tokens that can be used to query for engine assignments.  This
      *  can potentially query GoogleAuthUtil for an OAuth2 authentication token with userinfo.email
      *  privileges for a chosen Android account. */
     private TokenSource mTokenSource;
 
-    private BlimpView mBlimpView;
+    private BlimpContentsDisplay mBlimpContentsDisplay;
     private Toolbar mToolbar;
     private BlimpClientSession mBlimpClientSession;
     private TabControlFeature mTabControlFeature;
     private WindowAndroid mWindowAndroid;
 
     private Handler mHandler = new Handler();
 
     private boolean mFirstUrlLoadDone = false;
 
     // Flag to record the base value of the metrics when the debug view is turned on.
     private boolean mStatsBaseRecorded = false;
     private int mSentBase;
     private int mReceivedBase;
     private int mCommitsBase;
     private int mSent;
     private int mReceived;
     private int mCommits;
     private String mToken = null;
 
     @Override
-    @SuppressFBWarnings("DM_EXIT")  // FindBugs doesn't like System.exit().
+    @SuppressFBWarnings("DM_EXIT") // FindBugs doesn't like System.exit().
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         buildAndTriggerTokenSourceIfNeeded();
         try {
             BlimpLibraryLoader.startAsync(this);
         } catch (ProcessInitException e) {
             Log.e(TAG, "Native startup exception", e);
             System.exit(-1);
             return;
         }
     }
 
     @Override
     protected void onDestroy() {
         if (mTabControlFeature != null) {
             mTabControlFeature.destroy();
             mTabControlFeature = null;
         }
 
-        if (mBlimpView != null) {
-            mBlimpView.destroyRenderer();
-            mBlimpView = null;
+        if (mBlimpContentsDisplay != null) {
+            mBlimpContentsDisplay.destroyRenderer();
+            mBlimpContentsDisplay = null;
         }
 
         if (mToolbar != null) {
             mToolbar.destroy();
             mToolbar = null;
         }
 
         if (mTokenSource != null) {
             mTokenSource.destroy();
             mTokenSource = null;
@@ skipping 43 matching lines @@
             return;
         }
 
         setContentView(R.layout.blimp_main);
 
         mWindowAndroid = new WindowAndroid(BlimpRendererActivity.this);
         mBlimpClientSession =
                 new BlimpClientSession(PreferencesUtil.findAssignerUrl(this), mWindowAndroid);
         mBlimpClientSession.addObserver(this);
 
-        mBlimpView = (BlimpView) findViewById(R.id.renderer);
-        mBlimpView.initializeRenderer(mBlimpClientSession);
+        mBlimpContentsDisplay = (BlimpContentsDisplay) findViewById(R.id.renderer);
+        mBlimpContentsDisplay.initializeRenderer(mBlimpClientSession);
 
         mToolbar = (Toolbar) findViewById(R.id.toolbar);
         mToolbar.initialize(mBlimpClientSession, this);
 
-        mTabControlFeature = new TabControlFeature(mBlimpClientSession, mBlimpView);
+        mTabControlFeature = new TabControlFeature(mBlimpClientSession, mBlimpContentsDisplay);
 
         handleUrlFromIntent(getIntent());
 
         // If Blimp client has command line flag "engine-ip", client will use the command line token
         // to connect. See GetAssignmentFromCommandLine() in
         // blimp/client/session/assignment_source.cc
         // In normal cases, where client uses the engine ip given by the Assigner,
         // connection to the engine is triggered by the successful retrieval of a token as
         // TokenSource.Callback.
         if (CommandLine.getInstance().hasSwitch(BlimpClientSwitches.ENGINE_IP)) {
@@ skipping 155 matching lines @@
         // TokenSourceImpl. This will exponentially backoff while it tries to get the access
         // token.  See {@link RetryingTokenSource} for more information.  The underlying
         // TokenSourceImpl will attempt to query GoogleAuthUtil, but might fail if there is no
         // account selected, in which case it will ask this Activity to show an account chooser
         // and notify it of the selection result.
         mTokenSource = new RetryingTokenSource(new TokenSourceImpl(this));
         mTokenSource.setCallback(this);
         mTokenSource.getToken();
     }
 }