chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java - Issue 1292693002: Fix Custom Action Bar for custom tabs on tablet

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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

Issue 1292693002: Fix Custom Action Bar for custom tabs on tablet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

index 5b156f993d9297ec0d550d26b7c0eecb18f7ca60..ee5b052321eb138d823afae983c19f5c9e473b90 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

@@ -392,6 +392,13 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar {

OnClickListener listener) { }

/**

+ * @return The height of the tab strip. Return 0 for toolbars that do not have a tabstrip.

+ */

+ public int getTabStripHeight() {

+ return getResources().getDimensionPixelSize(R.dimen.tab_strip_height);

+ }

+ /**

* Triggered when the content view for the specified tab has changed.

protected void onTabContentViewChanged() {