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

Unified Diff: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

Issue 26740005: Let BaseChromiumApplication manage the tracing controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep BaseChromiumApplication (required by native unit tests) Created 7 years, 2 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: 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);

Powered by Google App Engine
This is Rietveld 408576698