dark_mode: Remove UnifiedSystemTrayView::GetBackgroundColor.

Bug: 1131543
Change-Id: I20ce373294ea711389bcf7673e49eb94fbce07b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431555Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Min Chen <minch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810783}

ash/system/holding_space/holding_space_tray.cc

@@ -13,13 +13,13 @@
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/style/ash_color_provider.h"
 #include "ash/system/holding_space/pinned_files_container.h"
 #include "ash/system/holding_space/recent_files_container.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_container.h"
 #include "ash/system/tray/tray_utils.h"
-#include "ash/system/unified/unified_system_tray_view.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
@@ -43,7 +43,8 @@ void SetupChildLayer(views::View* child) {
 
   auto* layer = child->layer();
   layer->SetRoundedCornerRadius(gfx::RoundedCornersF{kUnifiedTrayCornerRadius});
-  layer->SetColor(UnifiedSystemTrayView::GetBackgroundColor());
+  layer->SetColor(AshColorProvider::Get()->GetBaseLayerColor(
+      AshColorProvider::BaseLayerType::kTransparent80));
   layer->SetBackgroundBlur(kUnifiedMenuBackgroundBlur);
   layer->SetFillsBoundsOpaquely(false);
   layer->SetIsFastRoundedCorner(true);

ash/system/tray/tray_bubble_view.cc

@@ -8,6 +8,7 @@
 #include <numeric>
 
 #include "ash/public/cpp/ash_features.h"
+#include "ash/style/ash_color_provider.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/unified/unified_system_tray_view.h"
 #include "base/macros.h"
@@ -247,7 +248,8 @@ TrayBubbleView::TrayBubbleView(const InitParams& init_params)
 
     layer()->SetRoundedCornerRadius(
         gfx::RoundedCornersF{kUnifiedTrayCornerRadius});
-    layer()->SetColor(UnifiedSystemTrayView::GetBackgroundColor());
+    layer()->SetColor(AshColorProvider::Get()->GetBaseLayerColor(
+        AshColorProvider::BaseLayerType::kTransparent80));
     layer()->SetFillsBoundsOpaquely(false);
     layer()->SetIsFastRoundedCorner(true);
     layer()->SetBackgroundBlur(kUnifiedMenuBackgroundBlur);

ash/system/unified/unified_system_tray_view.cc

@@ -10,7 +10,6 @@
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
-#include "ash/style/ash_color_provider.h"
 #include "ash/system/media/unified_media_controls_container.h"
 #include "ash/system/message_center/ash_message_center_lock_screen_controller.h"
 #include "ash/system/message_center/unified_message_center_view.h"
@@ -172,12 +171,6 @@ class UnifiedSystemTrayView::SystemTrayContainer : public views::View {
   views::BoxLayout* const layout_manager_;
 };
 
-// static
-SkColor UnifiedSystemTrayView::GetBackgroundColor() {
-  return AshColorProvider::Get()->GetBaseLayerColor(
-      AshColorProvider::BaseLayerType::kTransparent80);
-}
-
 // static
 SkColor UnifiedSystemTrayView::GetFocusRingColor() {
   return ShelfConfig::Get()->shelf_focus_border_color();

ash/system/unified/unified_system_tray_view.h

@@ -65,9 +65,6 @@ class ASH_EXPORT UnifiedSystemTrayView : public views::View,
                                          public views::FocusTraversable,
                                          public views::FocusChangeListener {
  public:
-  // Get the background color of unified system tray.
-  static SkColor GetBackgroundColor();
-
   // Get focus ring color for system tray elements.
   static SkColor GetFocusRingColor();