Enabled themed color for blur disabled system UI

UX requirement to have theming enabled irrespective of blur
enable / disable.

Bug: 1049199
Change-Id: I6b7af77d12e75ed252d9c644577b9f4316eca76e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062680Reviewed-by: Matthew Mourgos <mmourgos@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Ahmed Mehfooz <amehfooz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742391}

ash/shelf/shelf_config.cc

@@ -350,9 +350,10 @@ SkColor ShelfConfig::GetThemedColorFromWallpaper(SkColor base_color) const {
 
 SkColor ShelfConfig::GetDefaultShelfColor() const {
   if (!features::IsBackgroundBlurEnabled()) {
-    return AshColorProvider::Get()->GetBaseLayerColor(
-        AshColorProvider::BaseLayerType::kTransparent90,
-        AshColorProvider::AshColorMode::kDark);
+    return GetThemedColorFromWallpaper(
+        AshColorProvider::Get()->GetBaseLayerColor(
+            AshColorProvider::BaseLayerType::kTransparent90,
+            AshColorProvider::AshColorMode::kDark));
   }
 
   AshColorProvider::BaseLayerType layer_type;

ash/system/unified/unified_system_tray_view.cc

@@ -255,17 +255,13 @@ class UnifiedSystemTrayView::FocusSearch : public views::FocusSearch {
 
 // static
 SkColor UnifiedSystemTrayView::GetBackgroundColor() {
-  if (!features::IsBackgroundBlurEnabled()) {
-    return AshColorProvider::Get()->DeprecatedGetBaseLayerColor(
-        AshColorProvider::BaseLayerType::kTransparent90,
-        kUnifiedMenuBackgroundColor);
-  }
   auto background_type = Shelf::ForWindow(Shell::GetPrimaryRootWindow())
                              ->shelf_widget()
                              ->GetBackgroundType();
   AshColorProvider::BaseLayerType layer_type =
       (background_type == ShelfBackgroundType::kMaximized ||
-       background_type == ShelfBackgroundType::kInApp)
+       background_type == ShelfBackgroundType::kInApp) ||
+       !features::IsBackgroundBlurEnabled()
           ? AshColorProvider::BaseLayerType::kTransparent90
           : AshColorProvider::BaseLayerType::kTransparent80;