[pull] main from chromium:main

DEPS

@@ -245,15 +245,15 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': '44a83926207668ad8de5eae74d68a54812ca55ad',
+  'skia_revision': '20981e308a4b7a96931b3749645c125d17c4e998',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': 'f5e412a1cd82fb606b79a587f1c4bda7f9445701',
+  'v8_revision': 'a943800464aa4c5238af46945807949fcfb3e370',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '543f5750f70e014dc9c2217fb2fcf1c6b63badd5',
+  'angle_revision': 'b9f2d9cc145520e7961acfd70077e91b9f03d2c1',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -312,7 +312,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': 'd6ef4a8af654ca24f8adca2a892f6f7857d57d2f',
+  'catapult_revision': '22e558b5843a77389ca3883d0950f0f34e6f690c',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
@@ -360,11 +360,11 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': '3649af2486cd1c805f364a54cdf127179330024a',
+  'dawn_revision': 'fc38f7d87901b200c3af3d4c90d3f2f43e2d2ff5',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'quiche_revision': '66b78407d91da2836206ee9ef904db81ecdc3694',
+  'quiche_revision': 'ed970f7c38381309e9306982efa8dcfac1201269',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ios_webkit
   # and whatever else without interference from each other.
@@ -838,7 +838,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_build_tools/aapt2',
-              'version': 'GlCdqxHxlg-8YkDGgj5cie-6COsEAZga9jyq-LAYxY4C',
+              'version': 'ZHiDoiurxMLwajQq_CwBH9zaDW5xwYWYGbedxIslTm8C',
           },
       ],
       'condition': 'checkout_android',
@@ -1410,7 +1410,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + 'b52786888ddce9d6bc06b7825ba9bffc65924e0c',
 
   'src/third_party/openscreen/src':
-    Var('chromium_git') + '/openscreen' + '@' + '8620ec89411da06662dfd920ba4e45b999269a77',
+    Var('chromium_git') + '/openscreen' + '@' + '499acfd929759f895539e717316bffa7525269b6',
 
   'src/third_party/openxr/src': {
     'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + 'bf21ccb1007bb531b45d9978919a56ea5059c245',
@@ -1730,7 +1730,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@6b2cb689b53fd43f282594b87295a1ebcf675b0b',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@c2192b8adaaef9fc4e1e51809e9b10599e0cf78d',
     'condition': 'checkout_src_internal',
   },
 

ash/app_list/app_list_controller_impl.cc

@@ -859,8 +859,12 @@ void AppListControllerImpl::OnTabletModeEnded() {
 }
 
 void AppListControllerImpl::OnWallpaperColorsChanged() {
-  if (IsVisible(last_visible_display_id_))
-    fullscreen_presenter_->GetView()->OnWallpaperColorsChanged();
+  // Clamshell ProductivityLauncher doesn't use wallpaper prominent color.
+  if (IsVisible(last_visible_display_id_) && !ShouldShowAppListBubble()) {
+    AppListView* app_list_view = fullscreen_presenter_->GetView();
+    DCHECK(app_list_view);
+    app_list_view->OnWallpaperColorsChanged();
+  }
 }
 
 void AppListControllerImpl::OnWallpaperPreviewStarted() {

ash/app_list/app_list_controller_impl_unittest.cc

@@ -1281,6 +1281,15 @@ TEST_F(AppListControllerImplAppListBubbleTest, EnteringTabletModeClosesBubble) {
   EXPECT_FALSE(controller->bubble_presenter_for_test()->IsShowing());
 }
 
+TEST_F(AppListControllerImplAppListBubbleTest,
+       WallpaperColorChangeDoesNotCrash) {
+  auto* controller = Shell::Get()->app_list_controller();
+  controller->ShowAppList();
+  // Simulate synced wallpaper update while bubble is open.
+  controller->OnWallpaperColorsChanged();
+  // No crash.
+}
+
 class AppListControllerWithAssistantTest : public AppListControllerImplTest {
  public:
   AppListControllerWithAssistantTest()

ash/app_list/views/apps_container_view.cc

@@ -135,8 +135,10 @@ constexpr int kContinueColumnCount = 4;
 // The vertical spacing between recent apps and continue section view.
 constexpr int kRecentAppsTopMargin = 16;
 
-// The vertical spacing above and below the separator.
-constexpr int kSeparatorVerticalInset = 16;
+// The vertical spacing above and below the separator when using kRegular/kDense
+// AppListConfigType.
+constexpr int kRegularSeparatorVerticalInset = 16;
+constexpr int kDenseSeparatorVerticalInset = 8;
 
 // The width of the separator.
 constexpr int kSeparatorWidth = 240;
@@ -285,8 +287,10 @@ class AppsContainerView::ContinueContainer : public views::View {
         ColorProvider::ContentLayerType::kSeparatorColor));
     separator_->SetPreferredSize(
         gfx::Size(kSeparatorWidth, views::Separator::kThickness));
+    // Initially set the vertical inset to kRegularSeparatorVerticalInset. The
+    // value will be updated in `AppsContainerView::UpdateAppListConfig()`
     separator_->SetProperty(views::kMarginsKey,
-                            gfx::Insets(kSeparatorVerticalInset, 0));
+                            gfx::Insets(kRegularSeparatorVerticalInset, 0));
     separator_->SetPaintToLayer();
     separator_->layer()->SetFillsBoundsOpaquely(false);
     separator_->SetProperty(views::kCrossAxisAlignmentKey,
@@ -315,6 +319,18 @@ class AppsContainerView::ContinueContainer : public views::View {
     return recent_apps_ && recent_apps_->GetVisible();
   }
 
+  void UpdateAppListConfig(AppListConfig* config) {
+    if (recent_apps_)
+      recent_apps_->UpdateAppListConfig(config);
+
+    const int separator_vertical_inset =
+        config->type() == AppListConfigType::kRegular
+            ? kRegularSeparatorVerticalInset
+            : kDenseSeparatorVerticalInset;
+    separator_->SetProperty(views::kMarginsKey,
+                            gfx::Insets(separator_vertical_inset, 0));
+  }
+
   ContinueSectionView* continue_section() { return continue_section_; }
   RecentAppsView* recent_apps() { return recent_apps_; }
   views::View* separator() { return separator_; }
@@ -494,8 +510,8 @@ void AppsContainerView::UpdateAppListConfig(const gfx::Rect& contents_bounds) {
 
   apps_grid_view()->UpdateAppListConfig(app_list_config_.get());
   app_list_folder_view()->UpdateAppListConfig(app_list_config_.get());
-  if (GetRecentApps())
-    GetRecentApps()->UpdateAppListConfig(app_list_config_.get());
+  if (continue_container_)
+    continue_container_->UpdateAppListConfig(app_list_config_.get());
 }
 
 void AppsContainerView::OnActiveAppListModelsChanged(

ash/ash_strings.grd

@@ -3365,11 +3365,15 @@ This file contains the strings for ash.
         Calendar
       </message>
 
-      <message name="IDS_ASH_CALENDAR_UP_BUTTON_ACCESSIBLE_DESCRIPTION" desc="The accessible description of the calendar up button.">
+      <message name="IDS_ASH_CALENDAR_CONTENT_ACCESSIBLE_DESCRIPTION" desc="The accessible description of the calendar content view.">
+        Calendar, <ph name="current_month_year">$1<ex>August 2021</ex></ph>, currently <ph name="date">$2<ex>August 31, 2021</ex></ph> is selected.
+      </message>
+
+      <message name="IDS_ASH_CALENDAR_UP_BUTTON_ACCESSIBLE_DESCRIPTION" desc="The accessible/tooltip description of the calendar up button.">
         Show previous month
       </message>
 
-      <message name="IDS_ASH_CALENDAR_DOWN_BUTTON_ACCESSIBLE_DESCRIPTION" desc="The accessible description of the calendar down button.">
+      <message name="IDS_ASH_CALENDAR_DOWN_BUTTON_ACCESSIBLE_DESCRIPTION" desc="The accessible/tooltip description of the calendar down button.">
         Show next month
       </message>
 
@@ -3381,10 +3385,38 @@ This file contains the strings for ash.
         Today
       </message>
 
+      <message name="IDS_ASH_CALENDA_TODAY_BUTTON_TOOLTIP" desc="The tooltip label for the calendar info button.">
+        Go back to today
+      </message>
+
       <message name="IDS_ASH_CALENDAR_SETTINGS" desc="The label used in the settings entry in the calendar view system settings.">
         Open settings
       </message>
 
+      <message name="IDS_ASH_CALENDAR_SETTINGS_TOOLTIP" desc="The tooltip label used in the settings entry in the calendar view system settings.">
+        Date and time settings
+      </message>
+
+      <message name="IDS_ASH_CLOSE_BUTTON_ACCESSIBLE_DESCRIPTION" desc="The accessible label used in the close button in the calendar event list view.">
+        Close event panel
+      </message>
+
+      <message name="IDS_ASH_CLOSE_BUTTON_TOOLTIP" desc="The tooltip label used in the close button in the calendar event list view.">
+        Close detail information
+      </message>
+
+      <message name="IDS_ASH_CALENDAR_DATE_CELL_TOOLTIP" desc="The tooltip of a calendar date cell, which is with 0 or 1 event.">
+        <ph name="date">$1<ex>August 31, 2021</ex></ph>, <ph name="number">$2<ex>0</ex></ph> event
+      </message>
+
+      <message name="IDS_ASH_CALENDAR_DATE_CELL_PLURAL_EVENTS_TOOLTIP" desc="The tooltip of a calendar date cell, which is with more than 1 event.">
+        <ph name="date">$1<ex>August 31, 2021</ex></ph>, <ph name="number">$2<ex>8</ex></ph> events
+      </message>
+
+      <message name="IDS_ASH_CALENDAR_SELECTED_DATE_CELL_ACCESSIBLE_DESCRIPTION" desc="The accessible label of the selected calendar date cell.">
+        Calendar, week of <ph name="date">$1<ex>July 16th 2021,</ex></ph>, <ph name="selected_date">$2<ex>18</ex></ph> is currently selected.
+      </message>
+
       <message name="IDS_ASH_CALENDAR_MON" desc="The single character designator for Monday, which is used in the calendar weekday label.">
         M
       </message>

ash/ash_strings_grd/IDS_ASH_CALENDAR_CONTENT_ACCESSIBLE_DESCRIPTION.png.sha1

@@ -0,0 +1 @@
+d409abf28cdab9afe8988ab7505df0a602159c40

ash/ash_strings_grd/IDS_ASH_CALENDAR_DATE_CELL_PLURAL_EVENTS_TOOLTIP.png.sha1

@@ -0,0 +1 @@
+0108793efa5647fb8f96ee91f78362e134d9e236

ash/ash_strings_grd/IDS_ASH_CALENDAR_DATE_CELL_TOOLTIP.png.sha1

@@ -0,0 +1 @@
+e6464fa8ee4d49be97ff35c31ac1f49f5e6786ca

ash/ash_strings_grd/IDS_ASH_CALENDAR_SELECTED_DATE_CELL_ACCESSIBLE_DESCRIPTION.png.sha1

@@ -0,0 +1 @@
+2c2017b5f606bd817d702f21d6fa7d36a322f81d

ash/ash_strings_grd/IDS_ASH_CALENDAR_SETTINGS_TOOLTIP.png.sha1

@@ -0,0 +1 @@
+f713c942aa78d6ed63f09bc940f7cd24c5a70cfa

ash/ash_strings_grd/IDS_ASH_CALENDA_TODAY_BUTTON_TOOLTIP.png.sha1

@@ -0,0 +1 @@
+90a221cc84429ec7090ec7bd69a147f8887cfc5c

ash/ash_strings_grd/IDS_ASH_CLOSE_BUTTON_ACCESSIBLE_DESCRIPTION.png.sha1

@@ -0,0 +1 @@
+7334a10e6e9c50bebe5c2119da8c2a75f77420e1

ash/ash_strings_grd/IDS_ASH_CLOSE_BUTTON_TOOLTIP.png.sha1

@@ -0,0 +1 @@
+a2d7d8eb7f42ed2880043230d6ee02ba4a8e5055

ash/components/arc/arc_features.cc

@@ -161,7 +161,7 @@ const base::Feature kUseDefaultBlockSize{"ArcVmUseDefaultBlockSize",
 // to delegate decoding tasks to VideoDecoder implementations, instead of using
 // VDA implementations created by GpuVideoDecodeAcceleratorFactory.
 const base::Feature kVideoDecoder{"ArcVideoDecoder",
-                                  base::FEATURE_DISABLED_BY_DEFAULT};
+                                  base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Controls whether a custom memory size is used when creating ARCVM. When
 // enabled, ARCVM is sized with the following formula:

ash/quick_pair/common/fast_pair/fast_pair_metrics.cc

@@ -27,6 +27,8 @@ const char kRetroactivePairingResultMetric[] =
     "Bluetooth.ChromeOS.FastPair.RetroactivePairing.Result";
 const char kTotalGattConnectionTimeMetric[] =
     "Bluetooth.ChromeOS.FastPair.TotalGattConnectionTime";
+const char kGattConnectionResult[] =
+    "Bluetooth.ChromeOS.FastPair.GattConnection.Result";
 const char kFastPairPairFailureInitialMetric[] =
     "Bluetooth.ChromeOS.FastPair.PairFailure.InitialPairingProtocol";
 const char kFastPairPairFailureSubsequentMetric[] =
@@ -119,6 +121,10 @@ void RecordTotalGattConnectionTime(base::TimeDelta total_gatt_connection_time) {
                           total_gatt_connection_time);
 }
 
+void RecordGattConnectionResult(bool success) {
+  base::UmaHistogramBoolean(kGattConnectionResult, success);
+}
+
 void RecordPairingResult(const Device& device, bool success) {
   switch (device.protocol) {
     case Protocol::kFastPairInitial:

ash/quick_pair/common/fast_pair/fast_pair_metrics.h

@@ -81,6 +81,9 @@ void RecordRetroactivePairingResult(bool success);
 COMPONENT_EXPORT(QUICK_PAIR_COMMON)
 void RecordTotalGattConnectionTime(base::TimeDelta total_gatt_connection_time);
 
+COMPONENT_EXPORT(QUICK_PAIR_COMMON)
+void RecordGattConnectionResult(bool success);
+
 COMPONENT_EXPORT(QUICK_PAIR_COMMON)
 void RecordPairingFailureReason(const Device& device, PairFailure failure);
 

ash/quick_pair/fast_pair_handshake/fast_pair_gatt_service_client_impl.cc

@@ -125,6 +125,8 @@ FastPairGattServiceClientImpl::~FastPairGattServiceClientImpl() = default;
 void FastPairGattServiceClientImpl::OnGattConnection(
     std::unique_ptr<device::BluetoothGattConnection> gatt_connection,
     absl::optional<device::BluetoothDevice::ConnectErrorCode> error_code) {
+  RecordGattConnectionResult(/*success=*/!error_code.has_value());
+
   if (error_code) {
     QP_LOG(WARNING) << "Error creating GATT connection to device due to error: "
                     << error_code.value();

ash/quick_pair/fast_pair_handshake/fast_pair_gatt_service_client_unittest.cc

@@ -40,6 +40,8 @@ using ErrorCallback =
 
 const char kTotalGattConnectionTime[] =
     "Bluetooth.ChromeOS.FastPair.TotalGattConnectionTime";
+const char kGattConnectionResult[] =
+    "Bluetooth.ChromeOS.FastPair.GattConnection.Result";
 
 constexpr base::TimeDelta kConnectingTestTimeout = base::Seconds(5);
 
@@ -537,28 +539,34 @@ class FastPairGattServiceClientTest : public testing::Test {
 
 TEST_F(FastPairGattServiceClientTest, GattServiceDiscoveryTimeout) {
   histogram_tester().ExpectTotalCount(kTotalGattConnectionTime, 0);
+  histogram_tester().ExpectTotalCount(kGattConnectionResult, 0);
   SuccessfulGattConnectionSetUp();
   FastForwardTimeByConnetingTimeout();
   NotifyGattDiscoveryCompleteForService();
   EXPECT_EQ(GetInitializedCallbackResult(),
             PairFailure::kGattServiceDiscoveryTimeout);
   EXPECT_FALSE(ServiceIsSet());
   histogram_tester().ExpectTotalCount(kTotalGattConnectionTime, 1);
+  histogram_tester().ExpectTotalCount(kGattConnectionResult, 1);
 }
 
 TEST_F(FastPairGattServiceClientTest, FailedGattConnection) {
   histogram_tester().ExpectTotalCount(kTotalGattConnectionTime, 0);
+  histogram_tester().ExpectTotalCount(kGattConnectionResult, 0);
   FailedGattConnectionSetUp();
   EXPECT_EQ(GetInitializedCallbackResult(), PairFailure::kCreateGattConnection);
   EXPECT_FALSE(ServiceIsSet());
   histogram_tester().ExpectTotalCount(kTotalGattConnectionTime, 0);
+  histogram_tester().ExpectTotalCount(kGattConnectionResult, 1);
 }
 
 TEST_F(FastPairGattServiceClientTest, GattConnectionSuccess) {
   histogram_tester().ExpectTotalCount(kTotalGattConnectionTime, 0);
+  histogram_tester().ExpectTotalCount(kGattConnectionResult, 0);
   SuccessfulGattConnectionSetUp();
   NotifyGattDiscoveryCompleteForService();
   histogram_tester().ExpectTotalCount(kTotalGattConnectionTime, 1);
+  histogram_tester().ExpectTotalCount(kGattConnectionResult, 1);
 }
 
 TEST_F(FastPairGattServiceClientTest, IgnoreNonFastPairServices) {

ash/strings/ash_strings_af.xtb

@@ -624,6 +624,7 @@ Alle gebruikers moet afmeld om voort te gaan.</translation>
 <translation id="5075554201838155866">Begin onderskrifte</translation>
 <translation id="5078796286268621944">Verkeerde PIN</translation>
 <translation id="5083553833479578423">Ontsluit meer Assistent-kenmerke.</translation>
+<translation id="5106223312672646208">Personaliseer</translation>
 <translation id="5117590920725113268">Wys volgende maand</translation>
 <translation id="5136175204352732067">Ander sleutelbord is gekoppel</translation>
 <translation id="5147567197700016471">Ontsluit</translation>

ash/strings/ash_strings_be.xtb

@@ -623,6 +623,7 @@
 <translation id="5075554201838155866">Паказаць субцітры</translation>
 <translation id="5078796286268621944">Няправільны PIN-код</translation>
 <translation id="5083553833479578423">Адкрыйце больш функцый Памочніка.</translation>
+<translation id="5106223312672646208">Персаналізаваць</translation>
 <translation id="5117590920725113268">Паказаць наступны месяц</translation>
 <translation id="5136175204352732067">Падключана іншая клавіятура</translation>
 <translation id="5147567197700016471">Прылада разблакіравана</translation>

ash/strings/ash_strings_cs.xtb

@@ -623,6 +623,7 @@ Pro začátek můžete vyzkoušet třeba tohle.</translation>
 <translation id="5075554201838155866">Zapnout skryté titulky</translation>
 <translation id="5078796286268621944">Nesprávný kód PIN</translation>
 <translation id="5083553833479578423">Odemkněte další funkce Asistenta.</translation>
+<translation id="5106223312672646208">Personalizace</translation>
 <translation id="5117590920725113268">Zobrazit další měsíc</translation>
 <translation id="5136175204352732067">Je připojena jiná klávesnice</translation>
 <translation id="5147567197700016471">Odemknuto</translation>

ash/strings/ash_strings_da.xtb

@@ -623,6 +623,7 @@ Her er nogle af de ting, du kan prøve for at komme godt i gang.</translation>
 <translation id="5075554201838155866">Start undertekster</translation>
 <translation id="5078796286268621944">Forkert pinkode</translation>
 <translation id="5083553833479578423">Få adgang til endnu flere Assistent-funktioner.</translation>
+<translation id="5106223312672646208">Tilpas</translation>
 <translation id="5117590920725113268">Vis næste måned</translation>
 <translation id="5136175204352732067">Du har tilsluttet et andet tastatur</translation>
 <translation id="5147567197700016471">Låst op</translation>

ash/strings/ash_strings_de.xtb

@@ -623,6 +623,7 @@ Hier sind ein paar Dinge, die du tun kannst, um loszulegen.</translation>
 <translation id="5075554201838155866">Untertitel verwenden</translation>
 <translation id="5078796286268621944">Falsche PIN</translation>
 <translation id="5083553833479578423">Möchten Sie weitere Assistant-Funktionen freischalten?</translation>
+<translation id="5106223312672646208">Personalisieren</translation>
 <translation id="5117590920725113268">Nächsten Monat anzeigen</translation>
 <translation id="5136175204352732067">Andere Tastatur angeschlossen</translation>
 <translation id="5147567197700016471">Entsperrt</translation>

ash/strings/ash_strings_es-419.xtb

@@ -624,6 +624,7 @@ Todos los usuarios deben salir de sus cuentas para continuar.</translation>
 <translation id="5075554201838155866">Activar subtítulos</translation>
 <translation id="5078796286268621944">Número de PIN incorrecto</translation>
 <translation id="5083553833479578423">Desbloquea más funciones del Asistente.</translation>
+<translation id="5106223312672646208">Personalizar</translation>
 <translation id="5117590920725113268">Mostrar el mes siguiente</translation>
 <translation id="5136175204352732067">Se conectó otro teclado</translation>
 <translation id="5147567197700016471">Desbloqueada</translation>

ash/strings/ash_strings_es.xtb

@@ -624,6 +624,7 @@ Todos los usuarios deben cerrar sesión para continuar.</translation>
 <translation id="5075554201838155866">Iniciar subtítulos</translation>
 <translation id="5078796286268621944">PIN incorrecto</translation>
 <translation id="5083553833479578423">Descubre más funciones del Asistente.</translation>
+<translation id="5106223312672646208">Personalizar</translation>
 <translation id="5117590920725113268">Mostrar mes siguiente</translation>
 <translation id="5136175204352732067">Se ha conectado otro teclado</translation>
 <translation id="5147567197700016471">Desbloqueado</translation>