chrome/android/java_staging/res/layout/control_container.xml - Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium.

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/java_staging/res/layout/control_container.xml

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: final patch? Created 5 years, 7 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/java_staging/res/layout/bookmarks_page.xml ('k') | chrome/android/java_staging/res/layout/dialog_with_titlebar.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_staging/res/layout/control_container.xml

diff --git a/chrome/android/java_staging/res/layout/control_container.xml b/chrome/android/java_staging/res/layout/control_container.xml

new file mode 100644

index 0000000000000000000000000000000000000000..a771affb59b5d91290c0641e489d25cce7130887

--- /dev/null

+++ b/chrome/android/java_staging/res/layout/control_container.xml

@@ -0,0 +1,46 @@

+<?xml version="1.0" encoding="utf-8"?>

+ Use of this source code is governed by a BSD-style license that can be

+ found in the LICENSE file. -->

+<org.chromium.chrome.browser.toolbar.ToolbarControlContainer xmlns:android="http://schemas.android.com/apk/res/android"

+ android:id="@+id/control_container"

+ android:layout_width="match_parent"

+ android:layout_height="wrap_content"

+ android:minHeight="@dimen/control_container_height" >

+ <view

+ class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$ToolbarViewResourceFrameLayout"

+ android:id="@+id/toolbar_container"

+ android:layout_width="match_parent"

+ android:layout_height="wrap_content">

+ <include

+ android:id="@+id/toolbar"

+ android:layout_width="match_parent"

+ android:layout_marginTop="@dimen/tab_strip_height"

+ android:layout_height="@dimen/toolbar_height_no_shadow"

+ layout="@layout/toolbar" />

+ <ImageView

+ android:id="@+id/toolbar_shadow"

+ android:src="@drawable/toolbar_shadow"

+ android:layout_width="match_parent"

+ android:layout_height="wrap_content"

+ android:layout_marginTop="@dimen/tab_strip_and_toolbar_height"

+ android:scaleType="fitXY"

+ android:contentDescription="@null" />

+ <ViewStub

+ android:id="@+id/find_toolbar_stub"

+ android:inflatedId="@+id/find_toolbar"

+ android:visibility="gone"

+ android:layout_marginTop="@dimen/tab_strip_height"

+ android:layout_width="match_parent"

+ android:layout_height="@dimen/toolbar_height_no_shadow"

+ android:layout="@layout/find_toolbar" />

+ <ViewStub

+ android:id="@+id/find_toolbar_tablet_stub"

+ android:inflatedId="@+id/find_toolbar"

+ android:layout_width="@dimen/find_in_page_popup_width"

+ android:layout_height="@dimen/find_in_page_popup_height"

+ android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"

+ android:layout_gravity="end|top"

+ android:layout="@layout/find_toolbar" />

+ </view>

+</org.chromium.chrome.browser.toolbar.ToolbarControlContainer>