Toolbar: Modularized target for toolbar/

This CL moves some of c.b.toolbar/ classes in the core build target
to a new modularized one under chrome/browser/toolbar. The rest
still stay in the core target due to direct or indirect references
to dependencies such as omnibox.

Bug: 1127732
Change-Id: I160deef07817b05dfd8e22adbd65225456de29ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592277
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840052}

chrome/android/BUILD.gn

@@ -354,6 +354,7 @@ android_library("chrome_java") {
     "//chrome/browser/ui/android/layouts/third_party/float_property:java",
     "//chrome/browser/ui/android/native_page:java",
     "//chrome/browser/ui/android/theme:java",
+    "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/uid/android:java",
     "//chrome/browser/user_education:java",
@@ -683,6 +684,7 @@ group("jni_headers") {
     "//chrome/browser/tab:jni_headers",
     "//chrome/browser/touch_to_fill/android:jni_headers",
     "//chrome/browser/ui/android/favicon:jni_headers",
+    "//chrome/browser/ui/android/toolbar:jni_headers",
     "//chrome/browser/ui/messages/android:jni_headers",
     "//chrome/browser/util:jni_headers",
     "//chrome/browser/webauthn/android:jni_headers",
@@ -853,6 +855,8 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/ui/android/layouts:junit",
     "//chrome/browser/ui/android/native_page:java",
     "//chrome/browser/ui/android/theme:java",
+    "//chrome/browser/ui/android/toolbar:java",
+    "//chrome/browser/ui/android/toolbar:junit",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/ui/messages/android:junit",
     "//chrome/browser/user_education:java",
@@ -1107,6 +1111,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/ui/android/layouts/third_party/float_property:java",
     "//chrome/browser/ui/android/native_page:java",
     "//chrome/browser/ui/android/theme:java",
+    "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/uid/android:java",
     "//chrome/browser/uid/android:javatests",
@@ -3448,7 +3453,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java",
     "java/src/org/chromium/chrome/browser/tabmodel/TabModelObserverJniBridge.java",
     "java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java",
-    "java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java",
     "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java",
     "java/src/org/chromium/chrome/browser/translate/TranslateBridge.java",
     "java/src/org/chromium/chrome/browser/usage_stats/NotificationSuspender.java",

chrome/android/chrome_java_resources.gni

@@ -45,7 +45,6 @@ chrome_java_resources = [
   "java/res/drawable-hdpi/btn_tabstrip_new_tab_pressed.png",
   "java/res/drawable-hdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-hdpi/btn_tabswitcher_modern.png",
-  "java/res/drawable-hdpi/btn_toolbar_home.png",
   "java/res/drawable-hdpi/btn_toolbar_reload.png",
   "java/res/drawable-hdpi/chrome_sync_logo.png",
   "java/res/drawable-hdpi/contextual_search_promo_ripple.9.png",
@@ -183,7 +182,6 @@ chrome_java_resources = [
   "java/res/drawable-mdpi/btn_tabstrip_new_tab_pressed.png",
   "java/res/drawable-mdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-mdpi/btn_tabswitcher_modern.png",
-  "java/res/drawable-mdpi/btn_toolbar_home.png",
   "java/res/drawable-mdpi/btn_toolbar_reload.png",
   "java/res/drawable-mdpi/chrome_sync_logo.png",
   "java/res/drawable-mdpi/contextual_search_promo_ripple.9.png",
@@ -310,7 +308,6 @@ chrome_java_resources = [
   "java/res/drawable-xhdpi/btn_tabstrip_new_tab_pressed.png",
   "java/res/drawable-xhdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-xhdpi/btn_tabswitcher_modern.png",
-  "java/res/drawable-xhdpi/btn_toolbar_home.png",
   "java/res/drawable-xhdpi/btn_toolbar_reload.png",
   "java/res/drawable-xhdpi/chrome_sync_logo.png",
   "java/res/drawable-xhdpi/contextual_search_promo_ripple.9.png",
@@ -415,7 +412,6 @@ chrome_java_resources = [
   "java/res/drawable-xxhdpi/btn_tabstrip_new_tab_pressed.png",
   "java/res/drawable-xxhdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-xxhdpi/btn_tabswitcher_modern.png",
-  "java/res/drawable-xxhdpi/btn_toolbar_home.png",
   "java/res/drawable-xxhdpi/btn_toolbar_reload.png",
   "java/res/drawable-xxhdpi/chrome_sync_logo.png",
   "java/res/drawable-xxhdpi/contextual_search_promo_ripple.9.png",
@@ -519,7 +515,6 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/btn_tabstrip_new_tab_pressed.png",
   "java/res/drawable-xxxhdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-xxxhdpi/btn_tabswitcher_modern.png",
-  "java/res/drawable-xxxhdpi/btn_toolbar_home.png",
   "java/res/drawable-xxxhdpi/btn_toolbar_reload.png",
   "java/res/drawable-xxxhdpi/chrome_sync_logo.png",
   "java/res/drawable-xxxhdpi/contextual_search_promo_ripple.9.png",

chrome/android/chrome_java_sources.gni

@@ -1386,18 +1386,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tasks/ReturnToChromeExperimentsUtil.java",
   "java/src/org/chromium/chrome/browser/tasks/TasksUma.java",
   "java/src/org/chromium/chrome/browser/toolbar/AppThemeColorProvider.java",
-  "java/src/org/chromium/chrome/browser/toolbar/ButtonData.java",
-  "java/src/org/chromium/chrome/browser/toolbar/ButtonDataProvider.java",
-  "java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java",
-  "java/src/org/chromium/chrome/browser/toolbar/HomeButton.java",
   "java/src/org/chromium/chrome/browser/toolbar/IncognitoToggleTabLayout.java",
-  "java/src/org/chromium/chrome/browser/toolbar/KeyboardNavigationListener.java",
   "java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java",
   "java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java",
   "java/src/org/chromium/chrome/browser/toolbar/NewTabButton.java",
-  "java/src/org/chromium/chrome/browser/toolbar/NewTabPageDelegate.java",
   "java/src/org/chromium/chrome/browser/toolbar/ProgressAnimationSmooth.java",
-  "java/src/org/chromium/chrome/browser/toolbar/SettableThemeColorProvider.java",
   "java/src/org/chromium/chrome/browser/toolbar/TabCountProvider.java",
   "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonProperties.java",
@@ -1409,16 +1402,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarDataProvider.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBar.java",
-  "java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarAnimatingView.java",
-  "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabController.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabControllerImpl.java",
-  "java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsProperties.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsViewBinder.java",
-  "java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewResourceFrameLayout.java",
-  "java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java",
   "java/src/org/chromium/chrome/browser/toolbar/load_progress/LoadProgressCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/load_progress/LoadProgressMediator.java",
   "java/src/org/chromium/chrome/browser/toolbar/load_progress/LoadProgressProperties.java",
@@ -1429,8 +1417,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonMediator.java",
   "java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonProperties.java",
   "java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonViewBinder.java",
-  "java/src/org/chromium/chrome/browser/toolbar/top/ActionModeController.java",
-  "java/src/org/chromium/chrome/browser/toolbar/top/CohortUtils.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/HomeButtonCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/IncognitoSwitchCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/IncognitoSwitchProperties.java",
@@ -1447,7 +1433,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/top/ToggleTabStackButton.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/ToggleTabStackButtonCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/Toolbar.java",
-  "java/src/org/chromium/chrome/browser/toolbar/top/ToolbarActionModeCallback.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java",
@@ -1457,7 +1442,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayMediator.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayProperties.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java",
-  "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java",
   "java/src/org/chromium/chrome/browser/tracing/TracingController.java",
   "java/src/org/chromium/chrome/browser/tracing/TracingNotificationManager.java",
   "java/src/org/chromium/chrome/browser/tracing/TracingNotificationServiceImpl.java",

chrome/android/chrome_junit_test_java_sources.gni

@@ -232,7 +232,6 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandlerTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/LocationBarModelUnitTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/ToolbarTabControllerImplTest.java",
-  "junit/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonControllerUnitTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinatorTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonMediatorTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonTest.java",

chrome/android/java/res/values-sw600dp/dimens.xml

@@ -14,9 +14,6 @@
     <!-- Data Saver -->
     <dimen name="data_usage_chart_height">325dp</dimen>
 
-    <!-- Tab Strip Dimensions -->
-    <dimen name="tab_strip_height">40dp</dimen>
-
     <!-- Full Screen Dimensions -->
     <dimen name="control_container_height">96dp</dimen>
     <dimen name="custom_tabs_control_container_height">64dp</dimen>

chrome/android/java/res/values/dimens.xml

@@ -176,9 +176,6 @@
     <!-- ModalDialogView dimensions -->
     <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
 
-    <!-- Tab Strip Dimensions -->
-    <dimen name="tab_strip_height">0dp</dimen>
-
     <!-- Full Screen Dimensions -->
     <!-- Should match toolbar_height_no_shadow -->
     <dimen name="control_container_height">56dp</dimen>

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoController.java

@@ -153,8 +153,8 @@ public class HomepagePromoController implements HomepageStateListener {
                 .with(PromoCardProperties.IS_IMPRESSION_ON_PRIMARY_BUTTON, true);
 
         if (layoutStyle == LayoutStyle.SLIM) {
-            Drawable homeIcon =
-                    AppCompatResources.getDrawable(mContext, R.drawable.btn_toolbar_home);
+            Drawable homeIcon = AppCompatResources.getDrawable(
+                    mContext, org.chromium.chrome.browser.toolbar.R.drawable.btn_toolbar_home);
             ColorStateList tint =
                     AppCompatResources.getColorStateList(mContext, R.color.default_icon_color_blue);
 
@@ -181,8 +181,8 @@ public class HomepagePromoController implements HomepageStateListener {
                     .with(PromoCardProperties.SECONDARY_BUTTON_CALLBACK, (v) -> dismissPromo());
 
         } else { // layoutStyle == LayoutStyle.COMPACT
-            Drawable homeIcon =
-                    AppCompatResources.getDrawable(mContext, R.drawable.btn_toolbar_home);
+            Drawable homeIcon = AppCompatResources.getDrawable(
+                    mContext, org.chromium.chrome.browser.toolbar.R.drawable.btn_toolbar_home);
             ColorStateList tint =
                     AppCompatResources.getColorStateList(mContext, R.color.default_icon_color_blue);
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/OWNERS

-mdjones@chromium.org
-tedchoc@chromium.org
-yusufo@chromium.org
-twellington@chromium.org
+file://chrome/browser/ui/android/toolbar/OWNERS
 
 per-file TabSwitcher*=file://chrome/android/java/src/org/chromium/chrome/browser/tasks/OWNERS

chrome/browser/android/compositor/scene_layer/scrolling_bottom_view_scene_layer.cc

@@ -7,7 +7,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "cc/layers/ui_resource_layer.h"
-#include "chrome/android/chrome_jni_headers/ScrollingBottomViewSceneLayer_jni.h"
+#include "chrome/browser/ui/android/toolbar/jni_headers/ScrollingBottomViewSceneLayer_jni.h"
 #include "ui/android/resources/resource_manager_impl.h"
 
 using base::android::JavaParamRef;

chrome/browser/ui/android/toolbar/BUILD.gn

+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/config.gni")
+import("//build/config/android/rules.gni")
+import("//chrome/browser/buildflags.gni")
+
+android_library("java") {
+  sources = [
+    "java/src/org/chromium/chrome/browser/toolbar/ButtonData.java",
+    "java/src/org/chromium/chrome/browser/toolbar/ButtonDataProvider.java",
+    "java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java",
+    "java/src/org/chromium/chrome/browser/toolbar/HomeButton.java",
+    "java/src/org/chromium/chrome/browser/toolbar/KeyboardNavigationListener.java",
+    "java/src/org/chromium/chrome/browser/toolbar/NewTabPageDelegate.java",
+    "java/src/org/chromium/chrome/browser/toolbar/SettableThemeColorProvider.java",
+    "java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarAnimatingView.java",
+    "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabController.java",
+    "java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java",
+    "java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewResourceFrameLayout.java",
+    "java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java",
+    "java/src/org/chromium/chrome/browser/toolbar/top/ActionModeController.java",
+    "java/src/org/chromium/chrome/browser/toolbar/top/CohortUtils.java",
+    "java/src/org/chromium/chrome/browser/toolbar/top/ToolbarActionModeCallback.java",
+    "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java",
+  ]
+
+  deps = [
+    ":java_resources",
+    "//base:base_java",
+    "//base:jni_java",
+    "//chrome/browser/android/lifecycle:java",
+    "//chrome/browser/browser_controls/android:java",
+    "//chrome/browser/device:java",
+    "//chrome/browser/flags:java",
+    "//chrome/browser/fullscreen/android:java",
+    "//chrome/browser/profiles/android:java",
+    "//chrome/browser/tab:java",
+    "//chrome/browser/ui/android/layouts:java",
+    "//chrome/browser/ui/android/theme:java",
+    "//chrome/browser/user_education:java",
+    "//components/browser_ui/widget/android:java",
+    "//components/embedder_support/android:util_java",
+    "//components/feature_engagement:feature_engagement_java",
+    "//content/public/android:content_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//ui/android:ui_full_java",
+  ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+  resources_package = "org.chromium.chrome.browser.toolbar"
+}
+
+generate_jni("jni_headers") {
+  sources = [ "java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java" ]
+}
+
+android_resources("java_resources") {
+  sources = [
+    "java/res/drawable-hdpi/btn_toolbar_home.png",
+    "java/res/drawable-mdpi/btn_toolbar_home.png",
+    "java/res/drawable-xhdpi/btn_toolbar_home.png",
+    "java/res/drawable-xxhdpi/btn_toolbar_home.png",
+    "java/res/drawable-xxxhdpi/btn_toolbar_home.png",
+  ]
+
+  deps = [
+    "//chrome/browser/ui/android/strings:ui_strings_grd",
+    "//components/browser_ui/styles/android:java_resources",
+  ]
+}
+
+java_library("junit") {
+  # Skip platform checks since Robolectric depends on requires_android targets.
+  bypass_platform_checks = true
+  testonly = true
+
+  sources = [ "java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonControllerUnitTest.java" ]
+
+  deps = [
+    ":java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//base:base_junit_test_support",
+    "//chrome/browser/android/lifecycle:java",
+    "//chrome/browser/flags:java",
+    "//chrome/browser/tab:java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//third_party/android_deps:robolectric_all_java",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
+    "//ui/android:ui_java",
+    "//url:gurl_java",
+  ]
+}

chrome/browser/ui/android/toolbar/DIR_METADATA

+monorail {
+  component: "UI>Browser>Toolbar"
+}
+os: ANDROID

chrome/browser/ui/android/toolbar/OWNERS

+mdjones@chromium.org
+tedchoc@chromium.org
+yusufo@chromium.org
+twellington@chromium.org

chrome/android/java/src/org/chromium/chrome/browser/toolbar/HomeButton.java → chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/HomeButton.java

@@ -20,7 +20,6 @@ import org.chromium.base.Callback;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.Supplier;
-import org.chromium.chrome.R;
 import org.chromium.ui.widget.ChromeImageButton;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java → chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java

@@ -13,7 +13,6 @@ import org.chromium.base.FeatureList;
 import org.chromium.base.ObserverList;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.supplier.Supplier;
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.ConfigurationChangedObserver;

chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewResourceFrameLayout.java → chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewResourceFrameLayout.java

@@ -10,7 +10,7 @@ import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 
-import org.chromium.chrome.R;
+import org.chromium.chrome.browser.toolbar.R;
 import org.chromium.components.browser_ui.widget.ViewResourceFrameLayout;
 import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ActionModeController.java → chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ActionModeController.java

@@ -14,7 +14,7 @@ import android.util.Property;
 
 import androidx.appcompat.app.ActionBar;
 
-import org.chromium.chrome.R;
+import org.chromium.chrome.browser.toolbar.R;
 
 /**
  * This class controls the how toolbar animates while the action mode bar is being shown. It also

chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/OWNERS

+per-file StartSurfaceToolbar*=file://chrome/android/java/src/org/chromium/chrome/browser/tasks/OWNERS
+per-file IncognitoSwitch*=file://chrome/android/java/src/org/chromium/chrome/browser/tasks/OWNERS

components/browser_ui/styles/android/BUILD.gn

@@ -174,6 +174,7 @@ android_resources("java_resources") {
     "java/res/values-night/drawables.xml",
     "java/res/values-night/values.xml",
     "java/res/values-sw600dp-v27/styles.xml",
+    "java/res/values-sw600dp/dimens.xml",
     "java/res/values-v27/styles.xml",
     "java/res/values/colors.xml",
     "java/res/values/dimens.xml",

components/browser_ui/styles/android/java/res/values-sw600dp/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<resources>
+    <!-- Tab Strip Dimensions -->
+    <dimen name="tab_strip_height">40dp</dimen>
+</resources>

components/browser_ui/styles/android/java/res/values/dimens.xml

@@ -17,4 +17,6 @@
     <!-- Toolbar dimensions -->
     <dimen name="toolbar_shadow_height">8dp</dimen>
 
+    <!-- Tab Strip Dimensions -->
+    <dimen name="tab_strip_height">0dp</dimen>
 </resources>