[pull] main from chromium:main

DEPS

@@ -239,7 +239,7 @@ 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': 'f74c7893fc17685e34089af7c81446e23cfab4ad',
+  'skia_revision': '68e240d9cdb3f09fc0c9de834aaef04aa3b3f579',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
@@ -1603,7 +1603,7 @@ deps = {
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '62d7d0c928c9a040dce96aa2f16c00e7e67d59cb',
 
-  'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@c038900769543d5883b1fab698c007831be50f48',
+  'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@2ec74208b0306eff87b9ebc097d8dfbb20e76fc2',
 
   'src/third_party/vulkan_memory_allocator':
     Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + '5e49f57a6e71a026a54eb42e366de09a4142d24e',

ash/BUILD.gn

@@ -3127,6 +3127,7 @@ static_library("test_support") {
     "//chromeos/system",
     "//chromeos/ui/frame",
     "//components/account_id",
+    "//components/exo/wayland:weston_test_stub",
     "//components/prefs:test_support",
     "//components/user_manager:user_manager",
     "//components/viz/test:test_support",

ash/system/message_center/ash_notification_view.cc

@@ -983,7 +983,8 @@ void AshNotificationView::UpdateAppIconView() {
 
   // Grouped child notification use notification's icon for the app icon view,
   // so we don't need further update here.
-  if (is_grouped_child_view_ && !notification->icon().IsEmpty())
+  if (!notification ||
+      (is_grouped_child_view_ && !notification->icon().IsEmpty()))
     return;
 
   SkColor accent_color = notification->accent_color().value_or(

ash/system/message_center/unified_message_center_bubble_unittest.cc

@@ -156,7 +156,78 @@ class UnifiedMessageCenterBubbleTest : public AshTestBase {
   int id_ = 0;
 };
 
-TEST_F(UnifiedMessageCenterBubbleTest, PositionedAboveSystemTray) {
+// TODO(crbug.com/1279984): Make this test a parameterized test. Currently fails
+// when NotificationRefresh enabled.
+TEST_F(UnifiedMessageCenterBubbleTest, HandleAccelerators) {
+  auto id = AddWebNotification();
+  WaitForAnimation();
+
+  // Open and focus message center.
+  DoAltShiftN();
+  WaitForAnimation();
+  EXPECT_TRUE(GetMessageCenterBubble()->IsMessageCenterVisible());
+  EXPECT_EQ(
+      1u,
+      message_center::MessageCenter::Get()->GetVisibleNotifications().size());
+
+  views::Widget* quick_settings_widget =
+      GetSystemTrayBubble()->GetBubbleWidget();
+  views::Widget* message_center_widget =
+      GetMessageCenterBubble()->GetBubbleWidget();
+  EXPECT_FALSE(quick_settings_widget->IsActive());
+  EXPECT_TRUE(message_center_widget->IsActive());
+
+  RemoveAllNotifications();
+  WaitForAnimation();
+  EXPECT_EQ(
+      0u,
+      message_center::MessageCenter::Get()->GetVisibleNotifications().size());
+  EXPECT_FALSE(quick_settings_widget->IsActive());
+  EXPECT_TRUE(message_center_widget->IsActive());
+  EXPECT_EQ(GetFirstMessageCenterFocusable(),
+            message_center_widget->GetFocusManager()->GetFocusedView());
+
+  // Press Esc to close system tray.
+  DoEsc();
+  WaitForAnimation();
+  EXPECT_EQ(nullptr,
+            GetPrimaryUnifiedSystemTray()->GetFocusManager()->GetFocusedView());
+}
+
+// Tests with NotificationsRefresh enabled and disabled.
+class ParameterizedMessageCenterBubbleTest
+    : public UnifiedMessageCenterBubbleTest,
+      public testing::WithParamInterface<bool> {
+ public:
+  ParameterizedMessageCenterBubbleTest() = default;
+
+  ParameterizedMessageCenterBubbleTest(
+      const ParameterizedMessageCenterBubbleTest&) = delete;
+  ParameterizedMessageCenterBubbleTest& operator=(
+      const ParameterizedMessageCenterBubbleTest&) = delete;
+
+  ~ParameterizedMessageCenterBubbleTest() override = default;
+
+  // AshTestBase:
+  void SetUp() override {
+    scoped_feature_list_ = std::make_unique<base::test::ScopedFeatureList>();
+    scoped_feature_list_->InitWithFeatureState(features::kNotificationsRefresh,
+                                               IsNotificationsRefreshEnabled());
+
+    UnifiedMessageCenterBubbleTest::SetUp();
+  }
+
+  bool IsNotificationsRefreshEnabled() const { return GetParam(); }
+
+ private:
+  std::unique_ptr<base::test::ScopedFeatureList> scoped_feature_list_;
+};
+
+INSTANTIATE_TEST_SUITE_P(All,
+                         ParameterizedMessageCenterBubbleTest,
+                         testing::Bool() /* IsNotificationsRefreshEnabled() */);
+
+TEST_P(ParameterizedMessageCenterBubbleTest, PositionedAboveSystemTray) {
   const int total_notifications = 5;
   GetPrimaryUnifiedSystemTray()->ShowBubble();
   AddNotification();
@@ -185,7 +256,7 @@ TEST_F(UnifiedMessageCenterBubbleTest, PositionedAboveSystemTray) {
   }
 }
 
-TEST_F(UnifiedMessageCenterBubbleTest, FocusCycle) {
+TEST_P(ParameterizedMessageCenterBubbleTest, FocusCycle) {
   GetPrimaryUnifiedSystemTray()->ShowBubble();
   AddNotification();
   AddNotification();
@@ -233,91 +304,7 @@ TEST_F(UnifiedMessageCenterBubbleTest, FocusCycle) {
             GetFirstQuickSettingsFocusable());
 }
 
-TEST_F(UnifiedMessageCenterBubbleTest, HandleAccelerators) {
-  auto id = AddWebNotification();
-  WaitForAnimation();
-
-  // Open and focus message center.
-  DoAltShiftN();
-  WaitForAnimation();
-  EXPECT_TRUE(GetMessageCenterBubble()->IsMessageCenterVisible());
-  EXPECT_EQ(
-      1u,
-      message_center::MessageCenter::Get()->GetVisibleNotifications().size());
-
-  views::Widget* quick_settings_widget =
-      GetSystemTrayBubble()->GetBubbleWidget();
-  views::Widget* message_center_widget =
-      GetMessageCenterBubble()->GetBubbleWidget();
-  EXPECT_FALSE(quick_settings_widget->IsActive());
-  EXPECT_TRUE(message_center_widget->IsActive());
-
-  RemoveAllNotifications();
-  WaitForAnimation();
-  EXPECT_EQ(
-      0u,
-      message_center::MessageCenter::Get()->GetVisibleNotifications().size());
-  EXPECT_FALSE(quick_settings_widget->IsActive());
-  EXPECT_TRUE(message_center_widget->IsActive());
-  EXPECT_EQ(GetFirstMessageCenterFocusable(),
-            message_center_widget->GetFocusManager()->GetFocusedView());
-
-  // Press Esc to close system tray.
-  DoEsc();
-  WaitForAnimation();
-  EXPECT_EQ(nullptr,
-            GetPrimaryUnifiedSystemTray()->GetFocusManager()->GetFocusedView());
-}
-
-TEST_F(UnifiedMessageCenterBubbleTest, ReverseFocusCycle) {
-  GetPrimaryUnifiedSystemTray()->ShowBubble();
-  AddNotification();
-  AddNotification();
-
-  views::Widget* quick_settings_widget =
-      GetSystemTrayBubble()->GetBubbleWidget();
-  views::Widget* message_center_widget =
-      GetMessageCenterBubble()->GetBubbleWidget();
-
-  // First shift tab should focus the last element in the quick settings bubble.
-  DoShiftTab();
-  EXPECT_TRUE(quick_settings_widget->IsActive());
-  EXPECT_FALSE(message_center_widget->IsActive());
-  EXPECT_EQ(quick_settings_widget->GetFocusManager()->GetFocusedView(),
-            GetLastQuickSettingsFocusable());
-
-  // Keep shift tabbing until we reach the first focusable element in the quick
-  // settings bubble.
-  while (quick_settings_widget->GetFocusManager()->GetFocusedView() !=
-         GetFirstQuickSettingsFocusable()) {
-    DoShiftTab();
-  }
-
-  // Shift tab at the first element in the quick settings bubble should move
-  // focus to the last element in the message center.
-  DoShiftTab();
-  EXPECT_TRUE(message_center_widget->IsActive());
-  EXPECT_FALSE(quick_settings_widget->IsActive());
-  EXPECT_EQ(message_center_widget->GetFocusManager()->GetFocusedView(),
-            GetLastMessageCenterFocusable());
-
-  // Keep shift tabbing until we reach the first focusable element in the
-  // message center bubble.
-  while (message_center_widget->GetFocusManager()->GetFocusedView() !=
-         GetFirstMessageCenterFocusable()) {
-    DoShiftTab();
-  }
-
-  // Shift tab at the first element in the message center bubble should move
-  // focus to the last element in the quick settings bubble.
-  DoShiftTab();
-  EXPECT_TRUE(quick_settings_widget->IsActive());
-  EXPECT_FALSE(message_center_widget->IsActive());
-  EXPECT_EQ(quick_settings_widget->GetFocusManager()->GetFocusedView(),
-            GetLastQuickSettingsFocusable());
-}
-
-TEST_F(UnifiedMessageCenterBubbleTest, CollapseState) {
+TEST_P(ParameterizedMessageCenterBubbleTest, CollapseState) {
   AddNotification();
   AddNotification();
 
@@ -368,7 +355,7 @@ TEST_F(UnifiedMessageCenterBubbleTest, CollapseState) {
   EXPECT_FALSE(IsMessageCenterCollapsed());
 }
 
-TEST_F(UnifiedMessageCenterBubbleTest, FocusCycleWithNoNotifications) {
+TEST_P(ParameterizedMessageCenterBubbleTest, FocusCycleWithNoNotifications) {
   GetPrimaryUnifiedSystemTray()->ShowBubble();
 
   views::Widget* quick_settings_widget =
@@ -399,39 +386,6 @@ TEST_F(UnifiedMessageCenterBubbleTest, FocusCycleWithNoNotifications) {
             GetFirstQuickSettingsFocusable());
 }
 
-// Tests with NotificationsRefresh enabled and disabled.
-class ParameterizedMessageCenterBubbleTest
-    : public UnifiedMessageCenterBubbleTest,
-      public testing::WithParamInterface<bool> {
- public:
-  ParameterizedMessageCenterBubbleTest() = default;
-
-  ParameterizedMessageCenterBubbleTest(
-      const ParameterizedMessageCenterBubbleTest&) = delete;
-  ParameterizedMessageCenterBubbleTest& operator=(
-      const ParameterizedMessageCenterBubbleTest&) = delete;
-
-  ~ParameterizedMessageCenterBubbleTest() override = default;
-
-  // AshTestBase:
-  void SetUp() override {
-    scoped_feature_list_ = std::make_unique<base::test::ScopedFeatureList>();
-    scoped_feature_list_->InitWithFeatureState(features::kNotificationsRefresh,
-                                               IsNotificationsRefreshEnabled());
-
-    UnifiedMessageCenterBubbleTest::SetUp();
-  }
-
-  bool IsNotificationsRefreshEnabled() const { return GetParam(); }
-
- private:
-  std::unique_ptr<base::test::ScopedFeatureList> scoped_feature_list_;
-};
-
-INSTANTIATE_TEST_SUITE_P(All,
-                         ParameterizedMessageCenterBubbleTest,
-                         testing::Bool() /* IsNotificationsRefreshEnabled() */);
-
 TEST_P(ParameterizedMessageCenterBubbleTest, BubbleBounds) {
   // Set display size where the message center is not collapsed.
   UpdateDisplay("0+0-1280×1024");

ash/system/time/calendar_event_list_item_view.cc

@@ -98,6 +98,7 @@ CalendarEventListItemView::CalendarEventListItemView(
       time_range_(new views::Label()) {
   SetLayoutManager(std::make_unique<views::FillLayout>());
   GetViewAccessibility().OverrideName(GetClassName());
+  SetFocusBehavior(FocusBehavior::ALWAYS);
 
   summary_->SetText(base::UTF8ToUTF16(event.summary()));
   SetUpLabel(summary_);

ash/system/time/calendar_event_list_view.h

@@ -34,6 +34,7 @@ class ASH_EXPORT CalendarEventListView
 
  private:
   friend class CalendarViewEventListViewTest;
+  friend class CalendarViewTest;
 
   // Updates the event list entries.
   void UpdateListItems();