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

Unified Diff: chrome/android/java/res/layout/toolbar_phone.xml

Issue 2410603002: Inflate toolbar layouts in ControlContainer (Closed)
Patch Set: fix ID Created 4 years, 2 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
Index: chrome/android/java/res/layout/toolbar_phone.xml
diff --git a/chrome/android/java/res/layout/toolbar.xml b/chrome/android/java/res/layout/toolbar_phone.xml
similarity index 87%
rename from chrome/android/java/res/layout/toolbar.xml
rename to chrome/android/java/res/layout/toolbar_phone.xml
index 6c26288f0d0aa3a9098b6016b271077e536b920b..6c6fbfd584cb167d68541d2d0ca153675e8a5d18 100644
--- a/chrome/android/java/res/layout/toolbar.xml
+++ b/chrome/android/java/res/layout/toolbar_phone.xml
@@ -8,9 +8,10 @@
<org.chromium.chrome.browser.toolbar.ToolbarPhone
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_no_shadow" >
- <include layout="@layout/toolbar_common"/>
+ <include layout="@layout/toolbar_phone_common"/>
</org.chromium.chrome.browser.toolbar.ToolbarPhone>
« no previous file with comments | « chrome/android/java/res/layout/toolbar_common.xml ('k') | chrome/android/java/res/layout/toolbar_phone_common.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698