Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: chrome/android/java/res/layout/main.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
OLDNEW
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 5
6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> 6 <merge xmlns:android="http://schemas.android.com/apk/res/android">
7 <LinearLayout 7 <LinearLayout
8 android:layout_width="match_parent" 8 android:layout_width="match_parent"
9 android:layout_height="match_parent" 9 android:layout_height="match_parent"
10 android:orientation="vertical"> 10 android:orientation="vertical">
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 android:layout_height="match_parent" 49 android:layout_height="match_parent"
50 /> 50 />
51 <!-- This empty view is used as the anchor for custom menu --> 51 <!-- This empty view is used as the anchor for custom menu -->
52 <View 52 <View
53 android:id="@+id/menu_anchor_stub" 53 android:id="@+id/menu_anchor_stub"
54 android:layout_width="0px" 54 android:layout_width="0px"
55 android:layout_height="0px" 55 android:layout_height="0px"
56 android:layout_gravity="bottom|start" 56 android:layout_gravity="bottom|start"
57 /> 57 />
58 </merge> 58 </merge>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/location_bar.xml ('k') | chrome/android/java/res/layout/most_visited_item.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698