Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java |
index 84a77aad5d304c0f1fb4d3f9512ec6115bdbf16b..fa95604aa482dc6446cbbd9ce2071be30b015c3d 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java |
@@ -163,7 +163,6 @@ public class ToolbarControlContainer extends FrameLayout implements ControlConta |
private final View mToolbarContainer; |
private Toolbar mToolbar; |
- private int mToolbarActualHeightPx; |
private int mTabStripHeightPx; |
/** Builds the resource adapter for the toolbar. */ |
@@ -178,12 +177,6 @@ public class ToolbarControlContainer extends FrameLayout implements ControlConta |
*/ |
public void setToolbar(Toolbar toolbar) { |
mToolbar = toolbar; |
- int containerHeightResId = R.dimen.control_container_height; |
- if (mToolbar instanceof CustomTabToolbar) { |
- containerHeightResId = R.dimen.custom_tabs_control_container_height; |
- } |
- mToolbarActualHeightPx = mToolbarContainer.getResources().getDimensionPixelSize( |
- containerHeightResId); |
mTabStripHeightPx = mToolbarContainer.getResources().getDimensionPixelSize( |
R.dimen.tab_strip_height); |
} |
@@ -228,8 +221,8 @@ public class ToolbarControlContainer extends FrameLayout implements ControlConta |
@Override |
protected void computeContentPadding(Rect outContentPadding) { |
- outContentPadding.set(0, mTabStripHeightPx, mToolbarContainer.getWidth(), |
- mToolbarActualHeightPx); |
+ outContentPadding.set( |
+ 0, mTabStripHeightPx, mToolbarContainer.getWidth(), mToolbar.getHeight()); |
} |
@Override |