CrOS GMC: Let notification use ash style color if necessary.

This CL makes CrOS GMC compatible with CrOS light/dark mode feature.

Bug: 1135656

Change-Id: Idd4955fd8676d2171bd323c1282198dc57345981
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2451316
Commit-Queue: Jazz Xu <jazzhsu@chromium.org>
Reviewed-by: Tommy Steimel <steimel@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814815}

ash/public/cpp/media_notification_provider.h

@@ -10,6 +10,10 @@
 #include "ash/public/cpp/ash_public_export.h"
 #include "third_party/skia/include/core/SkColor.h"
 
+namespace media_message_center {
+struct NotificationTheme;
+}  // namespace media_message_center
+
 namespace views {
 class View;
 }  // namespace views
@@ -40,7 +44,6 @@ class ASH_PUBLIC_EXPORT MediaNotificationProvider {
   // MediaNotificationContainerImpls. Used to populate the dialog on the Ash
   // shelf.
   virtual std::unique_ptr<views::View> GetMediaNotificationListView(
-      SkColor separator_color,
       int separator_thickness) = 0;
 
   // Returns a MediaNotificationContainerimplView for the active MediaSession.
@@ -50,6 +53,10 @@ class ASH_PUBLIC_EXPORT MediaNotificationProvider {
   // Used for ash to notify the bubble is closing.
   virtual void OnBubbleClosing() = 0;
 
+  // Set the color theme of media notification view.
+  virtual void SetColorTheme(
+      const media_message_center::NotificationTheme& color_theme) = 0;
+
  protected:
   virtual ~MediaNotificationProvider() = default;
 };

ash/system/media/media_tray.cc

@@ -19,6 +19,7 @@
 #include "ash/system/tray/tray_container.h"
 #include "ash/system/tray/tray_utils.h"
 #include "base/strings/string_util.h"
+#include "components/media_message_center/media_notification_view_impl.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
@@ -175,6 +176,7 @@ void MediaTray::PinButton::ButtonPressed(views::Button* sender,
 MediaTray::MediaTray(Shelf* shelf) : TrayBackgroundView(shelf) {
   if (MediaNotificationProvider::Get())
     MediaNotificationProvider::Get()->AddObserver(this);
+  SetNotificationColorTheme();
 
   Shell::Get()->session_controller()->AddObserver(this);
 
@@ -261,8 +263,6 @@ void MediaTray::ShowBubble(bool show_by_click) {
 
   content_view_ = bubble_view->AddChildView(
       MediaNotificationProvider::Get()->GetMediaNotificationListView(
-          AshColorProvider::Get()->GetContentLayerColor(
-              AshColorProvider::ContentLayerType::kSeparatorColor),
           kMenuSeparatorWidth));
 
   bubble_ = std::make_unique<TrayBubbleWrapper>(this, bubble_view,
@@ -323,6 +323,24 @@ void MediaTray::UpdateDisplayState() {
   SetVisiblePreferred(should_show);
 }
 
+void MediaTray::SetNotificationColorTheme() {
+  if (!MediaNotificationProvider::Get())
+    return;
+
+  media_message_center::NotificationTheme theme;
+  theme.primary_text_color = AshColorProvider::Get()->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kTextColorPrimary);
+  theme.secondary_text_color = AshColorProvider::Get()->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kTextColorSecondary);
+  theme.enabled_icon_color = AshColorProvider::Get()->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kIconColorPrimary);
+  theme.disabled_icon_color = AshColorProvider::Get()->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kIconColorSecondary);
+  theme.separator_color = AshColorProvider::Get()->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kSeparatorColor);
+  MediaNotificationProvider::Get()->SetColorTheme(theme);
+}
+
 void MediaTray::OnGlobalMediaControlsPinPrefChanged() {
   UpdateDisplayState();
 }

ash/system/media/media_tray.h

@@ -79,6 +79,9 @@ class ASH_EXPORT MediaTray : public MediaNotificationProviderObserver,
  private:
   friend class MediaTrayTest;
 
+  // Called when theme change, set colors for media notification view.
+  void SetNotificationColorTheme();
+
   // Called when global media controls pin pref is changed.
   void OnGlobalMediaControlsPinPrefChanged();
 

ash/system/media/media_tray_unittest.cc

@@ -9,6 +9,7 @@
 #include "ash/system/status_area_widget_test_helper.h"
 #include "ash/test/ash_test_base.h"
 #include "base/test/scoped_feature_list.h"
+#include "components/media_message_center/media_notification_view_impl.h"
 #include "media/base/media_switches.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/events/event.h"
@@ -23,9 +24,9 @@ class MockMediaNotificationProvider : public MediaNotificationProvider {
   MockMediaNotificationProvider() {
     MediaNotificationProvider::Set(this);
 
-    ON_CALL(*this, GetMediaNotificationListView(_, _))
-        .WillByDefault(
-            [](auto, auto) { return std::make_unique<views::View>(); });
+    ON_CALL(*this, GetMediaNotificationListView(_)).WillByDefault([](auto) {
+      return std::make_unique<views::View>();
+    });
   }
 
   ~MockMediaNotificationProvider() override {
@@ -33,14 +34,15 @@ class MockMediaNotificationProvider : public MediaNotificationProvider {
   }
 
   // Medianotificationprovider implementations.
-  MOCK_METHOD2(GetMediaNotificationListView,
-               std::unique_ptr<views::View>(SkColor, int));
+  MOCK_METHOD1(GetMediaNotificationListView, std::unique_ptr<views::View>(int));
   MOCK_METHOD0(GetActiveMediaNotificationView, std::unique_ptr<views::View>());
   MOCK_METHOD0(OnBubbleClosing, void());
   void AddObserver(MediaNotificationProviderObserver* observer) override {}
   void RemoveObserver(MediaNotificationProviderObserver* observer) override {}
   bool HasActiveNotifications() override { return has_active_notifications_; }
   bool HasFrozenNotifications() override { return has_frozen_notifications_; }
+  void SetColorTheme(
+      const media_message_center::NotificationTheme& color_theme) override {}
 
   void SetHasActiveNotifications(bool has_active_notifications) {
     has_active_notifications_ = has_active_notifications;
@@ -157,7 +159,7 @@ TEST_F(MediaTrayTest, ShowAndHideBubbleTest) {
   // Tap the media tray should show the bubble, and media tray should
   // be active. GetMediaNotificationlistview also should be called for
   // getting active notifications.
-  EXPECT_CALL(*provider(), GetMediaNotificationListView(_, _));
+  EXPECT_CALL(*provider(), GetMediaNotificationListView(_));
   SimulateTapOnMediaTray();
   EXPECT_NE(GetBubbleWrapper(), nullptr);
   EXPECT_TRUE(media_tray()->is_active());

ash/system/media/unified_media_controls_detailed_view_controller.cc

@@ -33,8 +33,6 @@ views::View* UnifiedMediaControlsDetailedViewController::CreateView() {
   return new UnifiedMediaControlsDetailedView(
       detailed_view_delegate_.get(),
       MediaNotificationProvider::Get()->GetMediaNotificationListView(
-          AshColorProvider::Get()->GetContentLayerColor(
-              AshColorProvider::ContentLayerType::kSeparatorColor),
           kMenuSeparatorWidth));
 }
 

ash/system/media/unified_media_controls_detailed_view_controller_unittest.cc

@@ -13,6 +13,7 @@
 #include "ash/system/unified/unified_system_tray_bubble.h"
 #include "ash/system/unified/unified_system_tray_controller.h"
 #include "ash/test/ash_test_base.h"
+#include "components/media_message_center/media_notification_view_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::_;
@@ -26,9 +27,9 @@ class MockMediaNotificationProvider : MediaNotificationProvider {
   MockMediaNotificationProvider() {
     MediaNotificationProvider::Set(this);
 
-    ON_CALL(*this, GetMediaNotificationListView(_, _))
-        .WillByDefault(
-            [](auto, auto) { return std::make_unique<views::View>(); });
+    ON_CALL(*this, GetMediaNotificationListView(_)).WillByDefault([](auto) {
+      return std::make_unique<views::View>();
+    });
   }
 
   ~MockMediaNotificationProvider() override {
@@ -36,8 +37,7 @@ class MockMediaNotificationProvider : MediaNotificationProvider {
   }
 
   // MediaNotificationProvider implementations.
-  MOCK_METHOD2(GetMediaNotificationListView,
-               std::unique_ptr<views::View>(SkColor, int));
+  MOCK_METHOD1(GetMediaNotificationListView, std::unique_ptr<views::View>(int));
   MOCK_METHOD0(OnBubbleClosing, void());
   std::unique_ptr<views::View> GetActiveMediaNotificationView() override {
     return std::make_unique<views::View>();
@@ -46,6 +46,8 @@ class MockMediaNotificationProvider : MediaNotificationProvider {
   void RemoveObserver(MediaNotificationProviderObserver* observer) override {}
   bool HasActiveNotifications() override { return true; }
   bool HasFrozenNotifications() override { return true; }
+  void SetColorTheme(
+      const media_message_center::NotificationTheme& color_theme) override {}
 };
 
 }  // namespace

chrome/browser/ui/ash/media_notification_provider_impl.cc

@@ -52,11 +52,11 @@ bool MediaNotificationProviderImpl::HasFrozenNotifications() {
 
 std::unique_ptr<views::View>
 MediaNotificationProviderImpl::GetMediaNotificationListView(
-    SkColor separator_color,
     int separator_thickness) {
   DCHECK(service_);
+  DCHECK(color_theme_);
   auto notification_list_view = std::make_unique<MediaNotificationListView>(
-      MediaNotificationListView::SeparatorStyle(separator_color,
+      MediaNotificationListView::SeparatorStyle(color_theme_->separator_color,
                                                 separator_thickness));
   active_session_view_ = notification_list_view.get();
   service_->SetDialogDelegate(this);
@@ -72,6 +72,11 @@ void MediaNotificationProviderImpl::OnBubbleClosing() {
   service_->SetDialogDelegate(nullptr);
 }
 
+void MediaNotificationProviderImpl::SetColorTheme(
+    const media_message_center::NotificationTheme& color_theme) {
+  color_theme_ = color_theme;
+}
+
 MediaNotificationContainerImpl* MediaNotificationProviderImpl::ShowMediaSession(
     const std::string& id,
     base::WeakPtr<media_message_center::MediaNotificationItem> item) {
@@ -79,9 +84,7 @@ MediaNotificationContainerImpl* MediaNotificationProviderImpl::ShowMediaSession(
     return nullptr;
 
   auto container = std::make_unique<MediaNotificationContainerImplView>(
-      id, item, service_,
-      media_message_center::MediaNotificationViewImpl::BackgroundStyle::
-          kAshStyle);
+      id, item, service_, color_theme_);
   MediaNotificationContainerImplView* container_ptr = container.get();
   container_ptr->AddObserver(this);
   observed_containers_[id] = container_ptr;

chrome/browser/ui/ash/media_notification_provider_impl.h

@@ -10,6 +10,7 @@
 #include "chrome/browser/ui/global_media_controls/media_dialog_delegate.h"
 #include "chrome/browser/ui/global_media_controls/media_notification_container_observer.h"
 #include "chrome/browser/ui/global_media_controls/media_notification_service_observer.h"
+#include "components/media_message_center/media_notification_view_impl.h"
 #include "components/session_manager/core/session_manager_observer.h"
 
 class MediaNotificationService;
@@ -33,10 +34,11 @@ class MediaNotificationProviderImpl
   bool HasActiveNotifications() override;
   bool HasFrozenNotifications() override;
   std::unique_ptr<views::View> GetMediaNotificationListView(
-      SkColor separator_color,
       int separator_thickness) override;
   std::unique_ptr<views::View> GetActiveMediaNotificationView() override;
   void OnBubbleClosing() override;
+  void SetColorTheme(
+      const media_message_center::NotificationTheme& color_theme) override;
 
   // MediaDialogDelegate implementations.
   MediaNotificationContainerImpl* ShowMediaSession(
@@ -78,6 +80,8 @@ class MediaNotificationProviderImpl
 
   std::map<const std::string, MediaNotificationContainerImplView*>
       observed_containers_;
+
+  base::Optional<media_message_center::NotificationTheme> color_theme_;
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_MEDIA_NOTIFICATION_PROVIDER_IMPL_H_

chrome/browser/ui/ash/media_notification_provider_impl_unittest.cc

@@ -128,8 +128,9 @@ TEST_F(MediaNotificationProviderImplTest, NotificationListTest) {
   EXPECT_CALL(*observer(), OnNotificationListViewSizeChanged).Times(2);
   SimulateShowNotification(id_1);
   SimulateShowNotification(id_2);
+  provider()->SetColorTheme(media_message_center::NotificationTheme());
   std::unique_ptr<views::View> view =
-      provider()->GetMediaNotificationListView(SK_ColorBLACK, 1);
+      provider()->GetMediaNotificationListView(1);
 
   auto* notification_list_view =
       static_cast<MediaNotificationListView*>(view.get());

chrome/browser/ui/views/global_media_controls/media_notification_container_impl_view.cc

@@ -80,8 +80,7 @@ MediaNotificationContainerImplView::MediaNotificationContainerImplView(
     const std::string& id,
     base::WeakPtr<media_message_center::MediaNotificationItem> item,
     MediaNotificationService* service,
-    media_message_center::MediaNotificationViewImpl::BackgroundStyle
-        background_style)
+    base::Optional<media_message_center::NotificationTheme> theme)
     : views::Button(this),
       id_(id),
       foreground_color_(kDefaultForegroundColor),
@@ -139,7 +138,7 @@ MediaNotificationContainerImplView::MediaNotificationContainerImplView(
   } else {
     view = std::make_unique<media_message_center::MediaNotificationViewImpl>(
         this, std::move(item), std::move(dismiss_button_placeholder),
-        base::string16(), kWidth, /*should_show_icon=*/false, background_style);
+        base::string16(), kWidth, /*should_show_icon=*/false, theme);
     SetPreferredSize(kNormalSize);
   }
 

chrome/browser/ui/views/global_media_controls/media_notification_container_impl_view.h

@@ -52,9 +52,8 @@ class MediaNotificationContainerImplView
       const std::string& id,
       base::WeakPtr<media_message_center::MediaNotificationItem> item,
       MediaNotificationService* service,
-      media_message_center::MediaNotificationViewImpl::BackgroundStyle
-          background_style = media_message_center::MediaNotificationViewImpl::
-              BackgroundStyle::kDefault);
+      base::Optional<media_message_center::NotificationTheme> theme =
+          base::nullopt);
   ~MediaNotificationContainerImplView() override;
 
   // views::Button:

components/media_message_center/media_notification_view_impl.cc

@@ -112,11 +112,12 @@ MediaNotificationViewImpl::MediaNotificationViewImpl(
     const base::string16& default_app_name,
     int notification_width,
     bool should_show_icon,
-    BackgroundStyle background_style)
+    base::Optional<NotificationTheme> theme)
     : container_(container),
       item_(std::move(item)),
       default_app_name_(default_app_name),
-      notification_width_(notification_width) {
+      notification_width_(notification_width),
+      theme_(theme) {
   DCHECK(container_);
 
   SetLayoutManager(std::make_unique<views::BoxLayout>(
@@ -267,7 +268,8 @@ MediaNotificationViewImpl::MediaNotificationViewImpl(
   picture_in_picture_button_ =
       button_row_->AddChildView(std::move(picture_in_picture_button));
 
-  if (background_style == BackgroundStyle::kAshStyle) {
+  // Use ash style background if we do have a theme.
+  if (theme_.has_value()) {
     SetBackground(std::make_unique<MediaNotificationBackgroundAshImpl>());
   } else {
     SetBackground(std::make_unique<MediaNotificationBackgroundImpl>(
@@ -624,16 +626,26 @@ void MediaNotificationViewImpl::UpdateForegroundColor() {
       GetMediaNotificationBackground()->GetBackgroundColor(*this);
   const SkColor foreground =
       GetMediaNotificationBackground()->GetForegroundColor(*this);
-  const SkColor separator_color = SkColorSetA(foreground, 0x1F);
-  const SkColor disabled_icon_color =
-      SkColorSetA(foreground, gfx::kDisabledControlAlpha);
 
-  title_label_->SetEnabledColor(foreground);
-  artist_label_->SetEnabledColor(foreground);
-  header_row_->SetAccentColor(foreground);
+  NotificationTheme theme;
+  if (theme_.has_value()) {
+    theme = *theme_;
+  } else {
+    theme.primary_text_color = foreground;
+    theme.secondary_text_color = foreground;
+    theme.enabled_icon_color = foreground;
+    theme.disabled_icon_color =
+        SkColorSetA(foreground, gfx::kDisabledControlAlpha);
+    theme.separator_color = SkColorSetA(foreground, 0x1F);
+  }
+
+  title_label_->SetEnabledColor(theme.primary_text_color);
+  artist_label_->SetEnabledColor(theme.secondary_text_color);
+  header_row_->SetAccentColor(theme.primary_text_color);
   if (vector_header_icon_) {
     header_row_->SetAppIcon(gfx::CreateVectorIcon(
-        *vector_header_icon_, message_center::kSmallImageSizeMD, foreground));
+        *vector_header_icon_, message_center::kSmallImageSizeMD,
+        theme.enabled_icon_color));
   }
 
   title_label_->SetBackgroundColor(background);
@@ -641,26 +653,28 @@ void MediaNotificationViewImpl::UpdateForegroundColor() {
   header_row_->SetBackgroundColor(background);
 
   pip_button_separator_view_->children().front()->SetBackground(
-      views::CreateSolidBackground(separator_color));
+      views::CreateSolidBackground(theme.separator_color));
 
   // Update play/pause button images.
   views::SetImageFromVectorIconWithColor(
       play_pause_button_,
       *GetVectorIconForMediaAction(MediaSessionAction::kPlay),
-      kMediaButtonIconSize, foreground);
+      kMediaButtonIconSize, theme.enabled_icon_color);
   views::SetToggledImageFromVectorIconWithColor(
       play_pause_button_,
       *GetVectorIconForMediaAction(MediaSessionAction::kPause),
-      kMediaButtonIconSize, foreground, disabled_icon_color);
+      kMediaButtonIconSize, theme.enabled_icon_color,
+      theme.disabled_icon_color);
 
   views::SetImageFromVectorIconWithColor(
       picture_in_picture_button_,
       *GetVectorIconForMediaAction(MediaSessionAction::kEnterPictureInPicture),
-      kMediaButtonIconSize, foreground);
+      kMediaButtonIconSize, theme.enabled_icon_color);
   views::SetToggledImageFromVectorIconWithColor(
       picture_in_picture_button_,
       *GetVectorIconForMediaAction(MediaSessionAction::kExitPictureInPicture),
-      kMediaButtonIconSize, foreground, disabled_icon_color);
+      kMediaButtonIconSize, theme.enabled_icon_color,
+      theme.disabled_icon_color);
 
   // Update action buttons.
   for (views::View* child : playback_button_container_->children()) {
@@ -672,12 +686,12 @@ void MediaNotificationViewImpl::UpdateForegroundColor() {
 
     views::SetImageFromVectorIconWithColor(
         button, *GetVectorIconForMediaAction(GetActionFromButtonTag(*button)),
-        kMediaButtonIconSize, foreground);
+        kMediaButtonIconSize, theme.enabled_icon_color);
 
     button->SchedulePaint();
   }
 
-  container_->OnColorsChanged(foreground, background);
+  container_->OnColorsChanged(theme.enabled_icon_color, background);
 }
 
 std::vector<views::View*> MediaNotificationViewImpl::GetButtons() {

components/media_message_center/media_notification_view_impl.h

@@ -29,6 +29,14 @@ class MediaNotificationBackground;
 class MediaNotificationContainer;
 class MediaNotificationItem;
 
+struct COMPONENT_EXPORT(MEDIA_MESSAGE_CENTER) NotificationTheme {
+  SkColor primary_text_color = 0;
+  SkColor secondary_text_color = 0;
+  SkColor enabled_icon_color = 0;
+  SkColor disabled_icon_color = 0;
+  SkColor separator_color = 0;
+};
+
 class COMPONENT_EXPORT(MEDIA_MESSAGE_CENTER) MediaNotificationViewImpl
     : public MediaNotificationView,
       public views::ButtonListener {
@@ -52,12 +60,6 @@ class COMPONENT_EXPORT(MEDIA_MESSAGE_CENTER) MediaNotificationViewImpl
     kMaxValue = kSource,
   };
 
-  // Allow MediaNotificationViewImpl show different styled background.
-  enum class BackgroundStyle {
-    kDefault,
-    kAshStyle,
-  };
-
   MediaNotificationViewImpl(
       MediaNotificationContainer* container,
       base::WeakPtr<MediaNotificationItem> item,
@@ -65,7 +67,7 @@ class COMPONENT_EXPORT(MEDIA_MESSAGE_CENTER) MediaNotificationViewImpl
       const base::string16& default_app_name,
       int notification_width,
       bool should_show_icon,
-      BackgroundStyle background_style = BackgroundStyle::kDefault);
+      base::Optional<NotificationTheme> theme = base::nullopt);
   ~MediaNotificationViewImpl() override;
 
   // views::View:
@@ -181,6 +183,8 @@ class COMPONENT_EXPORT(MEDIA_MESSAGE_CENTER) MediaNotificationViewImpl
   views::BoxLayout* title_artist_row_layout_ = nullptr;
   const gfx::VectorIcon* vector_header_icon_ = nullptr;
 
+  base::Optional<NotificationTheme> theme_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaNotificationViewImpl);
 };