blimp/client/app/android/java/res/layout/blimp_main.xml - Issue 2493333002: Move Java Blimp shell code to app subpackage

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: blimp/client/app/android/java/res/layout/blimp_main.xml

Issue 2493333002: Move Java Blimp shell code to app subpackage (Closed)

Patch Set: Merge branch 'refs/heads/master' into blimp-shell-integration Created 4 years, 1 month 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 | « blimp/client/app/android/blimp_view.cc ('k') | blimp/client/app/android/java/src/org/chromium/blimp/BlimpApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/app/android/java/res/layout/blimp_main.xml

diff --git a/blimp/client/app/android/java/res/layout/blimp_main.xml b/blimp/client/app/android/java/res/layout/blimp_main.xml

index 751901897db7ca4c46652ab5c406243cd1866a66..fb84581f46bbf90025d26e5f0e489196b7bfbca4 100644

--- a/blimp/client/app/android/java/res/layout/blimp_main.xml

+++ b/blimp/client/app/android/java/res/layout/blimp_main.xml

@@ -9,7 +9,7 @@

android:layout_height="match_parent"

android:orientation="vertical">

- <org.chromium.blimp.toolbar.Toolbar

+ <org.chromium.blimp.app.toolbar.Toolbar

android:id="@+id/toolbar"

android:layout_width="match_parent"

android:layout_height="56dp"

@@ -18,7 +18,7 @@

android:orientation="horizontal"

android:gravity="center"

android:background="#f2f2f2">

- <org.chromium.blimp.toolbar.UrlBar

+ <org.chromium.blimp.app.toolbar.UrlBar

android:id="@+id/toolbar_url_bar"

android:layout_width="0dp"

android:layout_height="48dp"

@@ -53,10 +53,10 @@

android:layout_gravity="center"

android:background="@null"

android:src="@drawable/btn_menu" />

- </org.chromium.blimp.toolbar.Toolbar>

+ </org.chromium.blimp.app.toolbar.Toolbar>

- <org.chromium.blimp.BlimpView

+ <org.chromium.blimp.app.BlimpContentsDisplay

android:id="@+id/renderer"

android:layout_width="match_parent"

android:layout_height="match_parent"

@@ -70,4 +70,4 @@

android:visibility="invisible" />

</RelativeLayout>

-</merge>

+</merge>