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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/java/res/layout/control_container.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
« no previous file with comments | « chrome/android/java/res/layout-sw600dp/toolbar.xml ('k') | chrome/android/java/res/layout/custom_tabs_control_container.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/res/layout/control_container.xml
diff --git a/chrome/android/java/res/layout/control_container.xml b/chrome/android/java/res/layout/control_container.xml
index a771affb59b5d91290c0641e489d25cce7130887..03f52945f74d8313b1cce8914bcf9d2463a2acf9 100644
--- a/chrome/android/java/res/layout/control_container.xml
+++ b/chrome/android/java/res/layout/control_container.xml
@@ -12,12 +12,11 @@
android:id="@+id/toolbar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <include
- android:id="@+id/toolbar"
+ <ViewStub
+ android:id="@+id/toolbar_stub"
android:layout_width="match_parent"
android:layout_marginTop="@dimen/tab_strip_height"
- android:layout_height="@dimen/toolbar_height_no_shadow"
- layout="@layout/toolbar" />
+ android:layout_height="@dimen/toolbar_height_no_shadow" />
<ImageView
android:id="@+id/toolbar_shadow"
android:src="@drawable/toolbar_shadow"
« no previous file with comments | « chrome/android/java/res/layout-sw600dp/toolbar.xml ('k') | chrome/android/java/res/layout/custom_tabs_control_container.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698