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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <?xml version="1.0" encoding="utf-8"?>

	2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.

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

	4 found in the LICENSE file. -->

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

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

	7 android:layout_width="match_parent"

	8 android:layout_height="wrap_content"

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

	10 <view

	11 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$Toolb arViewResourceFrameLayout"

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

	13 android:layout_width="match_parent"

	14 android:layout_height="wrap_content">

	15 <include

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

	17 android:layout_width="match_parent"

	18 android:layout_marginTop="@dimen/tab_strip_height"

	19 android:layout_height="@dimen/toolbar_height_no_shadow"

	20 layout="@layout/toolbar" />

	21 <ImageView

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

	23 android:src="@drawable/toolbar_shadow"

	24 android:layout_width="match_parent"

	25 android:layout_height="wrap_content"

	26 android:layout_marginTop="@dimen/tab_strip_and_toolbar_height"

	27 android:scaleType="fitXY"

	28 android:contentDescription="@null" />

	29 <ViewStub

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

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

	32 android:visibility="gone"

	33 android:layout_marginTop="@dimen/tab_strip_height"

	34 android:layout_width="match_parent"

	35 android:layout_height="@dimen/toolbar_height_no_shadow"

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

	37 <ViewStub

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

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

	40 android:layout_width="@dimen/find_in_page_popup_width"

	41 android:layout_height="@dimen/find_in_page_popup_height"

	42 android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"

	43 android:layout_gravity="end\|top"

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

	45 </view>

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

OLD	NEW