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

Unified Diff: mojo/shell/android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java

Issue 1091513005: Separate mojo/shell into a runner and the application manager (shell) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 8 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: mojo/shell/android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java
diff --git a/mojo/shell/android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java b/mojo/shell/android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java
deleted file mode 100644
index a56c43de651efc3659823a18418bb9024ad8061b..0000000000000000000000000000000000000000
--- a/mojo/shell/android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2013 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.mojo.shell;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.JsonReader;
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Activity for managing the Mojo Shell.
- */
-public class MojoShellActivity extends Activity {
- private static final String TAG = "MojoShellActivity";
-
- @Override
- protected void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- // TODO(ppi): Gotcha - the call below will work only once per process lifetime, but the OS
- // has no obligation to kill the application process between destroying and restarting the
- // activity. If the application process is kept alive, initialization parameters sent with
- // the intent will be stale.
- // TODO(qsr): We should be passing application context here as required by
- // InitApplicationContext on the native side. Currently we can't, as PlatformViewportAndroid
- // relies on this being the activity context.
- ShellMain.ensureInitialized(this, getParametersFromIntent(getIntent()));
-
- // TODO(eseidel): ShellMain can fail, but we're ignoring the return.
- ShellMain.start();
- }
-
- private static String[] getParametersFromIntent(Intent intent) {
- if (intent == null) {
- return null;
- }
- String[] parameters = intent.getStringArrayExtra("parameters");
- if (parameters != null) {
- return parameters;
- }
- String encodedParameters = intent.getStringExtra("encodedParameters");
- if (encodedParameters != null) {
- JsonReader reader = new JsonReader(new StringReader(encodedParameters));
- List<String> parametersList = new ArrayList<String>();
- try {
- reader.beginArray();
- while (reader.hasNext()) {
- parametersList.add(reader.nextString());
- }
- reader.endArray();
- reader.close();
- return parametersList.toArray(new String[parametersList.size()]);
- } catch (IOException e) {
- Log.w(TAG, e.getMessage(), e);
- }
- }
- return null;
- }
-}

Powered by Google App Engine
This is Rietveld 408576698