chrome/android/testshell/res/layout/testshell_activity.xml - Issue 10968003: Add rendering support to the TestShell.

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: chrome/android/testshell/res/layout/testshell_activity.xml

Issue 10968003: Add rendering support to the TestShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed nits, rebased. Created 8 years, 3 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 | « chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellToolbar.java ('k') | chrome/android/testshell/res/values/dimens.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/testshell/res/layout/testshell_activity.xml

diff --git a/content/shell/android/res/layout/shell_view.xml b/chrome/android/testshell/res/layout/testshell_activity.xml

similarity index 74%

copy from content/shell/android/res/layout/shell_view.xml

copy to chrome/android/testshell/res/layout/testshell_activity.xml

index d6c15d6f91f855af81c6a6550043c5fae7e1226a..43323a6e32aefb47dfb8bb48696486af272dc400 100644

--- a/content/shell/android/res/layout/shell_view.xml

+++ b/chrome/android/testshell/res/layout/testshell_activity.xml

@@ -6,13 +6,12 @@

found in the LICENSE file.

-->

-<org.chromium.content_shell.Shell

+<org.chromium.chrome.testshell.TabManager android:id="@+id/tab_manager"

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

- android:id="@+id/container"

android:layout_width="match_parent"

android:layout_height="match_parent"

- android:orientation="vertical" >

- <LinearLayout android:id="@+id/toolbar"

+ android:orientation="vertical">

+ <org.chromium.chrome.testshell.TestShellToolbar android:id="@+id/toolbar"

android:layout_width="match_parent"

android:layout_height="wrap_content"

android:orientation="horizontal"

@@ -40,9 +39,14 @@

android:layout_height="38dp"

android:src="@android:drawable/ic_media_next"

android:scaleType="center" />

- </LinearLayout>

- <FrameLayout android:id="@+id/contentview_holder"

+ </org.chromium.chrome.testshell.TestShellToolbar>

+ <FrameLayout android:id="@+id/content_container"

android:layout_width="match_parent"

android:layout_height="0dp"

- android:layout_weight="1" />

-</org.chromium.content_shell.Shell>

+ android:layout_weight="1">

+ <SurfaceView android:id="@+id/render_target"

+ android:layout_width="match_parent"

+ android:layout_height="match_parent" />

+ </FrameLayout>

+</org.chromium.chrome.testshell.TabManager>