| Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
|
| diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
|
| index 8bb0bbcb7779506fd0f1e9a30f3e2e2876839b6e..ffbfc6dd890be4ca060a06875d2242a6e3959c3d 100644
|
| --- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
|
| +++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
|
| @@ -21,7 +21,6 @@ import org.chromium.content.browser.ContentVideoViewClient;
|
| import org.chromium.content.browser.ContentView;
|
| import org.chromium.content.browser.ContentViewClient;
|
| import org.chromium.content.browser.DeviceUtils;
|
| -import org.chromium.content.browser.TracingControllerAndroid;
|
| import org.chromium.content.common.CommandLine;
|
| import org.chromium.content.common.ProcessInitException;
|
| import org.chromium.content_shell.Shell;
|
| @@ -41,7 +40,6 @@ public class ContentShellActivity extends Activity {
|
|
|
| private ShellManager mShellManager;
|
| private WindowAndroid mWindowAndroid;
|
| - private TracingControllerAndroid mTracingController;
|
|
|
| @Override
|
| protected void onCreate(final Bundle savedInstanceState) {
|
| @@ -142,25 +140,6 @@ public class ContentShellActivity extends Activity {
|
| }
|
| }
|
|
|
| - private TracingControllerAndroid getTracingController() {
|
| - if (mTracingController == null) {
|
| - mTracingController = new TracingControllerAndroid(this);
|
| - }
|
| - return mTracingController;
|
| - }
|
| -
|
| - @Override
|
| - protected void onResume() {
|
| - super.onResume();
|
| - getTracingController().registerReceiver(this);
|
| - }
|
| -
|
| - @Override
|
| - protected void onPause() {
|
| - super.onPause();
|
| - getTracingController().unregisterReceiver(this);
|
| - }
|
| -
|
| @Override
|
| public boolean onKeyUp(int keyCode, KeyEvent event) {
|
| if (keyCode != KeyEvent.KEYCODE_BACK) return super.onKeyUp(keyCode, event);
|
|
|