summaryrefslogtreecommitdiff
path: root/chromium/chrome/android/features
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-11-28 16:14:41 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-12-13 15:19:41 +0000
commit61d9742824d54be5693191fe502325a909feca59 (patch)
treecbf28e779b11338fe52eb75b915684cd8955542c /chromium/chrome/android/features
parent45f9ded08bb7526984b24ccb5a5327aaf6821676 (diff)
downloadqtwebengine-chromium-61d9742824d54be5693191fe502325a909feca59.tar.gz
BASELINE: Update Chromium to 108.0.5359.70
Change-Id: I77334ff232b819600f275bd3cfe41fbaa3619230 Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/445904 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/android/features')
-rw-r--r--chromium/chrome/android/features/android_library_factory/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/android_library_factory/test/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/android_library_factory/test/nocompile_gn/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/android_library_factory_tmpl.gni2
-rw-r--r--chromium/chrome/android/features/ar/ar_module.gni2
-rw-r--r--chromium/chrome/android/features/autofill_assistant/BUILD.gn11
-rw-r--r--chromium/chrome/android/features/autofill_assistant/autofill_assistant_module.gni2
-rw-r--r--chromium/chrome/android/features/autofill_assistant/guided_browsing/BUILD.gn4
-rw-r--r--chromium/chrome/android/features/autofill_assistant/public/java_sources.gni2
-rw-r--r--chromium/chrome/android/features/cablev2_authenticator/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/dev_ui/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/dev_ui/dev_ui_module.gni2
-rw-r--r--chromium/chrome/android/features/dev_ui/public/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/keyboard_accessory/BUILD.gn13
-rw-r--r--chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd3
-rw-r--r--chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/stack_unwinder/public/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/start_surface/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/start_surface/javatests/start_surface_test_java_sources.gni2
-rw-r--r--chromium/chrome/android/features/start_surface/junit/start_surface_junit_java_sources.gni3
-rw-r--r--chromium/chrome/android/features/start_surface/start_surface_java_sources.gni2
-rw-r--r--chromium/chrome/android/features/tab_ui/BUILD.gn7
-rw-r--r--chromium/chrome/android/features/tab_ui/buildflags.gni2
-rw-r--r--chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd59
-rw-r--r--chromium/chrome/android/features/tab_ui/public/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni4
-rw-r--r--chromium/chrome/android/features/tab_ui/tab_ui_module.gni2
-rw-r--r--chromium/chrome/android/features/vr/BUILD.gn2
-rw-r--r--chromium/chrome/android/features/vr/public_vr_java_sources.gni2
-rw-r--r--chromium/chrome/android/features/vr/vr_module.gni2
32 files changed, 119 insertions, 33 deletions
diff --git a/chromium/chrome/android/features/android_library_factory/BUILD.gn b/chromium/chrome/android/features/android_library_factory/BUILD.gn
index e72df126204..d942f12a38c 100644
--- a/chromium/chrome/android/features/android_library_factory/BUILD.gn
+++ b/chromium/chrome/android/features/android_library_factory/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2021 The Chromium Authors. All rights reserved.
+# Copyright 2021 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/android_library_factory/test/BUILD.gn b/chromium/chrome/android/features/android_library_factory/test/BUILD.gn
index 1de7fa2387a..5752233e873 100644
--- a/chromium/chrome/android/features/android_library_factory/test/BUILD.gn
+++ b/chromium/chrome/android/features/android_library_factory/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2021 The Chromium Authors. All rights reserved.
+# Copyright 2021 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/android_library_factory/test/nocompile_gn/BUILD.gn b/chromium/chrome/android/features/android_library_factory/test/nocompile_gn/BUILD.gn
index 899350e4ee0..b965360ec1e 100644
--- a/chromium/chrome/android/features/android_library_factory/test/nocompile_gn/BUILD.gn
+++ b/chromium/chrome/android/features/android_library_factory/test/nocompile_gn/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2021 The Chromium Authors. All rights reserved.
+# Copyright 2021 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/android_library_factory_tmpl.gni b/chromium/chrome/android/features/android_library_factory_tmpl.gni
index bbb867526be..c685d444daf 100644
--- a/chromium/chrome/android/features/android_library_factory_tmpl.gni
+++ b/chromium/chrome/android/features/android_library_factory_tmpl.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/ar/ar_module.gni b/chromium/chrome/android/features/ar/ar_module.gni
index 03534987ab3..00b951d3e62 100644
--- a/chromium/chrome/android/features/ar/ar_module.gni
+++ b/chromium/chrome/android/features/ar/ar_module.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index c1ca00bb4ad..e86f698f1d2 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -1,5 +1,5 @@
-# Copyright 2019 The Chromium Authors.All rights reserved.
-# Use of this source code is governed by a BSD - style license that can be
+# Copyright 2019 The Chromium Authors
+# 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")
@@ -58,8 +58,12 @@ android_library("unit_test_java") {
deps = [
"//base:base_java_test_support",
"//chrome/android:chrome_java",
+ "//chrome/browser/preferences:java",
+ "//chrome/browser/profiles/android:java",
"//components/autofill_assistant/android:java",
"//components/autofill_assistant/android:public_java",
+ "//components/prefs/android:java",
+ "//components/user_prefs/android:java",
"//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
"//third_party/mockito:mockito_java",
@@ -95,6 +99,7 @@ android_library("test_java") {
"javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInputActionIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInterruptIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantKeyboardIntegrationTest.java",
+ "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantLegalDisclaimerUiTest.java",
"javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantNavigationIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java",
@@ -158,6 +163,8 @@ android_library("test_java") {
"//components/browser_ui/widget/android:java",
"//components/external_intents/android:java",
"//components/image_fetcher:java",
+ "//components/prefs/android:java",
+ "//components/user_prefs/android:java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
diff --git a/chromium/chrome/android/features/autofill_assistant/autofill_assistant_module.gni b/chromium/chrome/android/features/autofill_assistant/autofill_assistant_module.gni
index 69d2a234777..8a48e70f321 100644
--- a/chromium/chrome/android/features/autofill_assistant/autofill_assistant_module.gni
+++ b/chromium/chrome/android/features/autofill_assistant/autofill_assistant_module.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/autofill_assistant/guided_browsing/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/guided_browsing/BUILD.gn
index 3a2bf061bf0..bc5c81d80c9 100644
--- a/chromium/chrome/android/features/autofill_assistant/guided_browsing/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/guided_browsing/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2022 The Chromium Authors. All rights reserved.
+# Copyright 2022 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -28,9 +28,11 @@ android_library("test_java") {
"//content/public/test/android:content_java_test_support",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
"//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
+ "//ui/android:ui_no_recycler_view_java",
]
}
diff --git a/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni b/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
index 15b2c99a0c0..141ee5c9ba3 100644
--- a/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
+++ b/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
index 6df6b7f3d1d..ccd0782dbc2 100644
--- a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
+# Copyright 2020 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/dev_ui/BUILD.gn b/chromium/chrome/android/features/dev_ui/BUILD.gn
index eec4bfb267d..49008e749fb 100644
--- a/chromium/chrome/android/features/dev_ui/BUILD.gn
+++ b/chromium/chrome/android/features/dev_ui/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
index 8c098e78143..a20fdfc1a64 100644
--- a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
+++ b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/dev_ui/public/BUILD.gn b/chromium/chrome/android/features/dev_ui/public/BUILD.gn
index ff498f1f45c..effa68b8de6 100644
--- a/chromium/chrome/android/features/dev_ui/public/BUILD.gn
+++ b/chromium/chrome/android/features/dev_ui/public/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
index 12df7a96491..422c816f2dc 100644
--- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -76,6 +76,7 @@ android_library("test_java") {
]
deps = [
+ ":test_resources",
"internal:internal_java",
"public:public_java",
"//base:base_java",
@@ -121,6 +122,16 @@ android_library("test_java") {
"//ui/android:ui_utils_java",
"//url:gurl_java",
]
+
+ resources_package = "org.chromium.chrome.browser.keyboard_accessory"
+}
+
+android_resources("test_resources") {
+ testonly = true
+
+ sources = [ "javatests/res/layout/test_main.xml" ]
+
+ deps = [ "internal:java_resources" ]
}
robolectric_binary("keyboard_accessory_junit_tests") {
diff --git a/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn
index d6d65c2a68c..b57704754dc 100644
--- a/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index 2e8b31a2ec2..f47d6216c32 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
index efc690f0b03..e8455e5137a 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
@@ -250,6 +250,9 @@
<message name="IDS_IPH_KEYBOARD_ACCESSORY_PAYMENT_VIRTUAL_CARDS" desc="Text used for the In-Product-Help bubble suggesting that the current credit card suggestion is a virtual card.">
Use your virtual card for added security
</message>
+ <message name="IDS_IPH_KEYBOARD_ACCESSORY_PAYMENT_OFFER" desc="Text used for the In-Product-Help bubble suggesting that the current credit card suggestion has a card linked offer attached.">
+ Cashback linked
+ </message>
</messages>
</release>
</grit>
diff --git a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
index 3988527c9ac..3ce09ccc44d 100644
--- a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn b/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn
index 3c2cf113950..91a381b6014 100644
--- a/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn
+++ b/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
+# Copyright 2020 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/start_surface/BUILD.gn b/chromium/chrome/android/features/start_surface/BUILD.gn
index 1b5a605b79a..72be0fe5f87 100644
--- a/chromium/chrome/android/features/start_surface/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2021 The Chromium Authors. All rights reserved.
+# Copyright 2021 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/start_surface/javatests/start_surface_test_java_sources.gni b/chromium/chrome/android/features/start_surface/javatests/start_surface_test_java_sources.gni
index b2015a72a83..06c6dadf3cc 100644
--- a/chromium/chrome/android/features/start_surface/javatests/start_surface_test_java_sources.gni
+++ b/chromium/chrome/android/features/start_surface/javatests/start_surface_test_java_sources.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/start_surface/junit/start_surface_junit_java_sources.gni b/chromium/chrome/android/features/start_surface/junit/start_surface_junit_java_sources.gni
index 90b2bed4293..af329ef3989 100644
--- a/chromium/chrome/android/features/start_surface/junit/start_surface_junit_java_sources.gni
+++ b/chromium/chrome/android/features/start_surface/junit/start_surface_junit_java_sources.gni
@@ -1,8 +1,9 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
start_surface_junit_java_sources = [
+ "//chrome/android/features/start_surface/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkNativesMockRule.java",
"//chrome/android/features/start_surface/junit/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinderUnitTest.java",
"//chrome/android/features/start_surface/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinatorUnitTest.java",
"//chrome/android/features/start_surface/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinatorUnitTestRule.java",
diff --git a/chromium/chrome/android/features/start_surface/start_surface_java_sources.gni b/chromium/chrome/android/features/start_surface/start_surface_java_sources.gni
index 86769cc9bdf..d8eaa4d4d8a 100644
--- a/chromium/chrome/android/features/start_surface/start_surface_java_sources.gni
+++ b/chromium/chrome/android/features/start_surface/start_surface_java_sources.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index cfed6b79079..ecbdd3059f8 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -32,6 +32,7 @@ android_resources("java_resources") {
"java/res/drawable/chevron_right.xml",
"java/res/drawable/fake_search_box_text_box_bg_incognito.xml",
"java/res/drawable/ic_check_googblue_20dp_animated.xml",
+ "java/res/drawable/ic_close_tabs_24dp.xml",
"java/res/drawable/ic_group_icon_16dp.xml",
"java/res/drawable/ic_price_alert_blue.xml",
"java/res/drawable/ic_rating_star_full.xml",
@@ -47,6 +48,7 @@ android_resources("java_resources") {
"java/res/drawable/tab_grid_card_background.xml",
"java/res/drawable/tab_grid_dialog_background.xml",
"java/res/drawable/tab_grid_selection_list_icon.xml",
+ "java/res/drawable/tab_selection_editor_share_icon.xml",
"java/res/drawable/tab_strip_fading_edge_end.xml",
"java/res/drawable/tab_strip_fading_edge_start.xml",
"java/res/drawable/tab_strip_favicon_circle.xml",
@@ -146,6 +148,7 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorAction.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionProperties.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionProvider.java",
+ "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionViewLayout.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorCloseAction.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorCoordinator.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorGroupAction.java",
@@ -157,6 +160,7 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorMenuItem.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorProperties.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorSelectionAction.java",
+ "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorShareAction.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorToolbar.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorUngroupAction.java",
"java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripSnapshotter.java",
@@ -218,6 +222,7 @@ android_library("java") {
"//components/browser_ui/bottomsheet/android:java",
"//components/browser_ui/share/android:java",
"//components/browser_ui/styles/android:java",
+ "//components/browser_ui/util/android:java",
"//components/browser_ui/widget/android:java",
"//components/embedder_support/android:util_java",
"//components/embedder_support/android:web_contents_delegate_java",
diff --git a/chromium/chrome/android/features/tab_ui/buildflags.gni b/chromium/chrome/android/features/tab_ui/buildflags.gni
index e15c9ae3e17..1243188f7c2 100644
--- a/chromium/chrome/android/features/tab_ui/buildflags.gni
+++ b/chromium/chrome/android/features/tab_ui/buildflags.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
index cf62719d909..74f7780552b 100644
--- a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
+++ b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -247,12 +247,67 @@
<message name="IDS_ACCESSIBILITY_TAB_SELECTION_EDITOR" desc="Accessibility string for Tab Selection Editor view. This string is announced when the Tab Selection Editor is shown to screen.">
Multi-select mode
</message>
- <message name="IDS_TAB_SELECTION_EDITOR_SELECT_ALL" desc="This text button is shown in the Tab Selection Editor Toolbar. When the user taps the button, Chrome selects all the tabs shown in the editor.">
+ <!-- Tab Selection Editor V2 strings -->
+ <message name="IDS_TAB_SELECTION_EDITOR_SELECT_ALL" desc="This text button is shown in the Tab Selection Editor Toolbar. When the user taps the button, Chrome selects all the tabs shown in the editor. [CHAR_LIMIT=27]">
Select all
</message>
- <message name="IDS_TAB_SELECTION_EDITOR_DESELECT_ALL" desc="This text button is shown in the Tab Selection Editor Toolbar. When the user taps the button, Chrome deselects all the tabs shown in the editor.">
+ <message name="IDS_TAB_SELECTION_EDITOR_DESELECT_ALL" desc="This text button is shown in the Tab Selection Editor Toolbar. When the user taps the button, Chrome deselects all the tabs shown in the editor. [CHAR_LIMIT=27]">
Deselect all
</message>
+ <message name="IDS_TAB_SELECTION_EDITOR_SHARE_TABS_ACTION_BUTTON" desc="This text button is shown in the Tab Selection Editor Toolbar. When the user taps the button, Chrome shares all currently selected tabs shown in the editor. [CHAR_LIMIT=27]">
+ {TABS_COUNT, plural,
+ =1 {Share tab}
+ other {Share tabs}
+ }
+ </message>
+ <message name="IDS_ACCESSIBILITY_TAB_SELECTION_EDITOR_SHARE_TABS_ACTION_BUTTON" desc="The accessibility string for the share button in the Tab Selection Editor Toolbar. Tap this button to share all selected tabs.">
+ {TABS_COUNT, plural,
+ =1 {Share <ph name="TABS_COUNT_ONE">%1$d<ex>1</ex></ph> selected tab}
+ other {Share <ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> selected tabs}
+ }
+ </message>
+ <message name="IDS_TAB_SELECTION_EDITOR_TABS_COUNT" desc="The text for the selection counter shown in the Tab Selection Editor Toolbar. This shows the number of selected tabs including those within selected groups.">
+ {TABS_COUNT, plural,
+ =1 {<ph name="TABS_COUNT_ONE">%1$d<ex>1</ex></ph> tab}
+ other {<ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> tabs}
+ }
+ </message>
+ <message name="IDS_TAB_SELECTION_EDITOR_GROUP_TABS" desc="This text menu item is shown in the Tab Selection Editor menu. 'Group' is a verb. When the user taps the menu item, Chrome creates a new group that contains the selected tabs. [CHAR_LIMIT=27]">
+ {TABS_COUNT, plural,
+ =1 {Group tab}
+ other {Group tabs}
+ }
+ </message>
+ <message name="IDS_ACCESSIBILITY_TAB_SELECTION_EDITOR_GROUP_TABS" desc="The accessibility text to read when the 'Group tabs' menu item in the selection mode menu is focused. When this menu item is tapped, all the selected tabs will be grouped together.">
+ {TABS_COUNT, plural,
+ =1 {Group <ph name="TABS_COUNT_ONE">%1$d<ex>1</ex></ph> selected tab}
+ other {Group <ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> selected tabs}
+ }
+ </message>
+ <message name="IDS_TAB_SELECTION_EDITOR_UNGROUP_TABS" desc="This text menu item is shown in the Tab Selection Editor menu. 'Ungroup' is a verb. When the user taps the menu item, Chrome removes the selected tabs from the group. [CHAR_LIMIT=27]">
+ {TABS_COUNT, plural,
+ =1 {Ungroup tab}
+ other {Ungroup tabs}
+ }
+ </message>
+ <message name="IDS_ACCESSIBILITY_TAB_SELECTION_EDITOR_UNGROUP_TABS" desc="The accessibility text to read when the 'Ungroup tabs' menu item in the selection mode menu is focused. When this menu item is tapped, all the selected tabs will be ungroup.">
+ {TABS_COUNT, plural,
+ =1 {Ungroup <ph name="TABS_COUNT_ONE">%1$d<ex>1</ex></ph> selected tab}
+ other {Ungroup <ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> selected tabs}
+ }
+ </message>
+ <message name="IDS_TAB_SELECTION_EDITOR_CLOSE_TABS" desc="This text menu item is shown in the Tab Selection Editor menu. 'Close' is a verb. When the user taps the menu item, Chrome closes the selected tabs. [CHAR_LIMIT=27]">
+ {TABS_COUNT, plural,
+ =1 {Close tab}
+ other {Close tabs}
+ }
+ </message>
+ <message name="IDS_ACCESSIBILITY_TAB_SELECTION_EDITOR_CLOSE_TABS" desc="The accessibility text to read when the 'Close tabs' menu item in the selection mode menu is focused. When this menu item is tapped, all the selected tabs will be closed.">
+ {TABS_COUNT, plural,
+ =1 {Close <ph name="TABS_COUNT_ONE">%1$d<ex>1</ex></ph> selected tab}
+ other {Close <ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> selected tabs}
+ }
+ </message>
<!-- Tab Grid Dialog strings -->
<message name="IDS_TAB_GRID_DIALOG_REMOVE_FROM_GROUP" desc="This text shows on the ungroup bar in TabGridDialog. When user drags a tab and drops it on the ungroup bar, this tab will be moved out of the group.">
diff --git a/chromium/chrome/android/features/tab_ui/public/BUILD.gn b/chromium/chrome/android/features/tab_ui/public/BUILD.gn
index 1f34c92ad7a..164f28e9129 100644
--- a/chromium/chrome/android/features/tab_ui/public/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/public/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
index 0316b28dbfa..f1584fcd441 100644
--- a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
+++ b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -61,9 +61,11 @@ tab_management_junit_java_sources = [
"//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListFaviconProviderTest.java",
"//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java",
"//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionProviderUnitTest.java",
+ "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionUnitTestHelper.java",
"//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorCloseActionUnitTest.java",
"//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorGroupActionUnitTest.java",
"//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorSelectionActionUnitTest.java",
+ "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorShareActionUnitTest.java",
"//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorUngroupActionUnitTest.java",
"//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabStripSnapshotterTest.java",
"//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageServiceUnitTest.java",
diff --git a/chromium/chrome/android/features/tab_ui/tab_ui_module.gni b/chromium/chrome/android/features/tab_ui/tab_ui_module.gni
index e153234108c..3fad048a4fa 100644
--- a/chromium/chrome/android/features/tab_ui/tab_ui_module.gni
+++ b/chromium/chrome/android/features/tab_ui/tab_ui_module.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn
index 863a86a2d10..c514eb53d60 100644
--- a/chromium/chrome/android/features/vr/BUILD.gn
+++ b/chromium/chrome/android/features/vr/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/vr/public_vr_java_sources.gni b/chromium/chrome/android/features/vr/public_vr_java_sources.gni
index a74e6c266ba..d0138f85d9e 100644
--- a/chromium/chrome/android/features/vr/public_vr_java_sources.gni
+++ b/chromium/chrome/android/features/vr/public_vr_java_sources.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/chromium/chrome/android/features/vr/vr_module.gni b/chromium/chrome/android/features/vr/vr_module.gni
index 1d705d4bcf4..9aea524d6ae 100644
--- a/chromium/chrome/android/features/vr/vr_module.gni
+++ b/chromium/chrome/android/features/vr/vr_module.gni
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.