Toolbar: Tidy up toolbar resources

Follow-up on https://crrev.com/c/2592277
 - Move control_container.xml to toolbar/
 - Move tab_strip_height dimension to toolbar/
 - Merge OWNERS files

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

chrome/android/BUILD.gn

@@ -203,6 +203,7 @@ android_resources("chrome_app_java_resources") {
     "//chrome/browser/ui/android/favicon:java_resources",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
     "//chrome/browser/ui/android/theme:java_resources",
+    "//chrome/browser/ui/android/toolbar:java_resources",
     "//chrome/browser/ui/messages/android:java_resources",
     "//components/autofill/android:autofill_java_resources",
     "//components/blocked_content/android:java_resources",

chrome/android/chrome_java_resources.gni

@@ -791,7 +791,6 @@ chrome_java_resources = [
   "java/res/layout/contextual_search_promo_view.xml",
   "java/res/layout/contextual_search_quick_action_icon_view.xml",
   "java/res/layout/contextual_search_term_view.xml",
-  "java/res/layout/control_container.xml",
   "java/res/layout/custom_preference.xml",
   "java/res/layout/custom_tabs_bottombar.xml",
   "java/res/layout/custom_tabs_bottombar_item.xml",

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

@@ -63,6 +63,9 @@ android_resources("java_resources") {
     "java/res/drawable-xhdpi/btn_toolbar_home.png",
     "java/res/drawable-xxhdpi/btn_toolbar_home.png",
     "java/res/drawable-xxxhdpi/btn_toolbar_home.png",
+    "java/res/layout/control_container.xml",
+    "java/res/values-sw600dp/dimens.xml",
+    "java/res/values/dimens.xml",
   ]
 
   deps = [

chrome/browser/ui/android/toolbar/OWNERS

@@ -2,3 +2,6 @@ mdjones@chromium.org
 tedchoc@chromium.org
 yusufo@chromium.org
 twellington@chromium.org
+
+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/java/res/values-sw600dp/dimens.xml → chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 The Chromium Authors. All rights reserved.
+<!-- Copyright 2021 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. -->
 

chrome/browser/ui/android/toolbar/java/res/values/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 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">0dp</dimen>
+</resources>

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,7 +174,6 @@ 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/dimens.xml

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