Skip to content

Commit fbfdf4e

Browse files
Initialize ShellManager withou View
1 parent ed74e88 commit fbfdf4e

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

cobalt/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ protected void initializeBrowserProcess() {
6868
}
6969

7070
ContentUriUtils.setFileProviderUtil(new FileProviderHelper());
71-
setContentView(getTestActivityViewId());
72-
mShellManager = (ShellManager) findViewById(getShellManagerViewId());
71+
mShellManager = new ShellManager(this);
7372
IntentRequestTracker intentRequestTracker = IntentRequestTracker.createFromActivity(this);
7473
mWindowAndroid = new ActivityWindowAndroid(
7574
this, /* listenToActivityState= */ true, intentRequestTracker);
7675
mShellManager.setWindow(mWindowAndroid);
76+
setContentView(mShellManager.getContentViewRenderView());
7777

7878
Window wind = this.getWindow();
7979
wind.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
@@ -112,7 +112,5 @@ public void onFailure() {
112112
protected String getUserDataDirectoryCommandLineSwitch() {
113113
return "data-path";
114114
}
115-
protected abstract int getTestActivityViewId();
116115

117-
protected abstract int getShellManagerViewId();
118116
}

cobalt/testing/browser_tests/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,4 @@ protected File getPrivateDataDirectory() {
4242
ContentBrowserTestsApplication.PRIVATE_DATA_DIRECTORY_SUFFIX);
4343
}
4444

45-
@Override
46-
protected int getTestActivityViewId() {
47-
return R.layout.test_activity;
48-
}
49-
50-
@Override
51-
protected int getShellManagerViewId() {
52-
return R.id.shell_container;
53-
}
54-
5545
}

0 commit comments

Comments
 (0)