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

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
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>

Powered by Google App Engine
This is Rietveld 408576698