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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2410603002: Inflate toolbar layouts in ControlContainer (Closed)
Patch Set: fix custom tabs 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
« chrome/android/java/res/layout/custom_tabs_toolbar.xml ('K') | « chrome/android/java/res/layout/toolbar.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/res/layout/toolbar_tablet.xml
diff --git a/chrome/android/java/res/layout-sw600dp/toolbar.xml b/chrome/android/java/res/layout/toolbar_tablet.xml
similarity index 99%
rename from chrome/android/java/res/layout-sw600dp/toolbar.xml
rename to chrome/android/java/res/layout/toolbar_tablet.xml
index f93f93f77a2b92caecf8f97efa71a70b6a2c06ed..9699ff3cc4a1e6a6ade13a7b1f5e6efd1c2c5065 100644
--- a/chrome/android/java/res/layout-sw600dp/toolbar.xml
+++ b/chrome/android/java/res/layout/toolbar_tablet.xml
@@ -8,6 +8,7 @@
<org.chromium.chrome.browser.toolbar.ToolbarTablet
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"
android:layout_marginTop="@dimen/tab_strip_height"
« chrome/android/java/res/layout/custom_tabs_toolbar.xml ('K') | « chrome/android/java/res/layout/toolbar.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698