content/shell/android/browsertests_apk/res/layout/test_activity.xml - Issue 12188016: Allow BrowserTestBase to do wait.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/android/browsertests_apk/res/layout/test_activity.xml

Issue 12188016: Allow BrowserTestBase to do wait. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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

« no previous file with comments | « content/public/test/browser_test_base.cc ('k') | content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/browsertests_apk/res/layout/test_activity.xml

diff --git a/content/shell/android/browsertests_apk/res/layout/test_activity.xml b/content/shell/android/browsertests_apk/res/layout/test_activity.xml

index c62e66ec5dc4c82b36ee5bece9d72661b013a6bd..fbcb803faff6fe865f7606425655672247413c46 100644

--- a/content/shell/android/browsertests_apk/res/layout/test_activity.xml

+++ b/content/shell/android/browsertests_apk/res/layout/test_activity.xml

@@ -6,9 +6,11 @@

found in the LICENSE file.

-->

-<merge xmlns:android="http://schemas.android.com/apk/res/android">

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+ android:layout_width="fill_parent" android:layout_height="fill_parent"

+ android:orientation="vertical">

<org.chromium.content_shell.ShellManager

android:id="@+id/shell_container"

android:layout_width="match_parent"

android:layout_height="match_parent" />

-</merge>

+</LinearLayout>