chrome/android/java/res/layout/control_container.xml - Issue 1178323005: Move remaining resources from java_staging/res to java/res.

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

Issue 1178323005: Move remaining resources from java_staging/res to java/res. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@res_default

Patch Set: renamed conflicting resource in chrome shell Created 5 years, 6 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

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

2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.	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	3 Use of this source code is governed by a BSD-style license that can be

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

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

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

7 android:layout_width="match_parent"	7 android:layout_width="match_parent"

8 android:layout_height="wrap_content"	8 android:layout_height="wrap_content"

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

10 <view	10 <view

(...skipping 26 matching lines...) Expand all Loading...
37 <ViewStub	37 <ViewStub

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

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

40 android:layout_width="@dimen/find_in_page_popup_width"	40 android:layout_width="@dimen/find_in_page_popup_width"

41 android:layout_height="@dimen/find_in_page_popup_height"	41 android:layout_height="@dimen/find_in_page_popup_height"

42 android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"	42 android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"

43 android:layout_gravity="end\|top"	43 android:layout_gravity="end\|top"

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

45 </view>	45 </view>

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

OLD	NEW