From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 12 Oct 2020 14:27:29 +0200
Subject: BASELINE: Update Chromium to 85.0.4183.140

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 .../weblayer/browser/java/res/values/colors.xml    | 11 ++++++
 .../weblayer/browser/java/res/values/dimens.xml    | 11 +++++-
 .../weblayer/browser/java/res/values/styles.xml    | 43 ++++------------------
 3 files changed, 29 insertions(+), 36 deletions(-)
 create mode 100644 chromium/weblayer/browser/java/res/values/colors.xml

(limited to 'chromium/weblayer/browser/java/res/values')

diff --git a/chromium/weblayer/browser/java/res/values/colors.xml b/chromium/weblayer/browser/java/res/values/colors.xml
new file mode 100644
index 00000000000..bb00b313960
--- /dev/null
+++ b/chromium/weblayer/browser/java/res/values/colors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 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 xmlns:tools="http://schemas.android.com/tools">
+    <!-- Please see src/ui/android/java/res/values/colors.xml for the shared common colors. -->
+
+    <color name="weblayer_tab_layout_selected_tab_color">@color/default_text_color_blue</color>
+
+</resources>
diff --git a/chromium/weblayer/browser/java/res/values/dimens.xml b/chromium/weblayer/browser/java/res/values/dimens.xml
index dfce8d8e51e..0eee3fc9758 100644
--- a/chromium/weblayer/browser/java/res/values/dimens.xml
+++ b/chromium/weblayer/browser/java/res/values/dimens.xml
@@ -6,4 +6,13 @@
 <resources>
     <dimen name="security_status_icon_size">18dp</dimen>
     <dimen name="url_text_edge_padding">5dp</dimen>
-</resources>
\ No newline at end of file
+  
+    <!-- Dimensions for compact translate infobar. -->
+    <dimen name="weblayer_infobar_translate_fade_edge_length">18dp</dimen>
+    <dimen name="weblayer_infobar_translate_menu_width">260dp</dimen>
+
+    <!-- Dimens of tab indicator -->
+    <dimen name="weblayer_tab_indicator_radius">3dp</dimen>
+    <dimen name="weblayer_tab_indicator_padding">2dp</dimen>
+
+</resources>
diff --git a/chromium/weblayer/browser/java/res/values/styles.xml b/chromium/weblayer/browser/java/res/values/styles.xml
index b90beb2e45c..f362fd9ab69 100644
--- a/chromium/weblayer/browser/java/res/values/styles.xml
+++ b/chromium/weblayer/browser/java/res/values/styles.xml
@@ -10,40 +10,13 @@
         <item name="alertDialogTheme">@style/Theme.Chromium.AlertDialog</item>
     </style>
 
-    <style name="PreferenceTheme">
-        <item name="preferenceStyle">@style/PreferenceItem</item>
-        <item name="preferenceFragmentCompatStyle">@style/SettingsFragment</item>
-        <item name="preferenceFragmentListStyle">@style/SettingsFragmentList</item>
-        <item name="dialogPreferenceStyle">@style/DialogPreference</item>
-        <item name="checkBoxPreferenceStyle">@style/CheckBoxPreference</item>
-        <item name="switchPreferenceCompatStyle">@style/SwitchPreference</item>
-    </style>
-
-    <style name="PreferenceItem">
-        <item name="android:layout">@layout/preference_compat</item>
-    </style>
-
-    <style name="SettingsFragment">
-        <item name="android:divider">?android:attr/listDivider</item>
-    </style>
-
-    <style name="SettingsFragmentList">
-        <item name="android:paddingStart">0dp</item>
-        <item name="android:paddingEnd">0dp</item>
-    </style>
-
-    <style name="DialogPreference">
-        <item name="android:layout">@layout/preference_compat</item>
-        <item name="android:negativeButtonText">@android:string/cancel</item>
-    </style>
-
-    <style name="CheckBoxPreference">
-        <item name="android:layout">@layout/preference_compat</item>
-        <item name="android:widgetLayout">@layout/preference_widget_checkbox</item>
-    </style>
-
-    <style name="SwitchPreference">
-        <item name="android:layout">@layout/preference_compat</item>
-        <item name="android:widgetLayout">@layout/preference_widget_switch_compat</item>
+    <!-- The following styles may be used to style views provided by a CustomViewBinder or attached
+         to the app menu as headers or footers. -->
+
+    <!-- Styling for an app menu item row. -->
+    <style name="WebLayerAppMenuItem">
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
+        <item name="android:background">?attr/listChoiceBackgroundIndicator</item>
     </style>
 </resources>
-- 
cgit v1.2.1